Skip to content

Commit

Permalink
luci-app-upnp: revise wording to include PCP
Browse files Browse the repository at this point in the history 
- Revise wording, remove redundancies and mention IPv6 limitations
- Mention `UPnP IGD` as `UPnP` is probably not specific enough
- Include current wording in `LUCI_TITLE` for easy finding

Signed-off-by: Sergey Ponomarev <[email protected]>
  • Loading branch information
@stokito @systemcrash
stokito authored and systemcrash committed Mar 9, 2024
1 parent 47a8e2a commit 78d0c7e
Show file tree
Hide file tree
Showing 41 changed files with 1,470 additions and 1,794 deletions.
2 changes: 1 addition & 1 deletion applications/luci-app-upnp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

include $(TOPDIR)/rules.mk

LUCI_TITLE:=Universal Plug & Play configuration module
LUCI_TITLE:=Universal Plug and Play (UPnP IGD) & PCP/NAT-PMP configuration module
LUCI_DEPENDS:=+luci-base +miniupnpd +rpcd-mod-ucode

include ../../luci.mk
Expand Down
4 changes: 2 additions & 2 deletions applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ handleDelRule = function(num, ev) {
};

return baseclass.extend({
title: _('Active UPnP Redirects'),
title: _('Active Port Forwards'),

load: function() {
return Promise.all([
Expand Down Expand Up @@ -67,7 +67,7 @@ return baseclass.extend({
];
});

cbi_update_table(table, rows, E('em', _('There are no active redirects.')));
cbi_update_table(table, rows, E('em', _('There are no active port forwards.')));

return table;
}
Expand Down
42 changes: 21 additions & 21 deletions applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ return view.extend({
];
});

cbi_update_table(nodes.querySelector('#upnp_status_table'), rows, E('em', _('There are no active redirects.')));
cbi_update_table(nodes.querySelector('#upnp_status_table'), rows, E('em', _('There are no active port forwards.')));

return;
},
Expand All @@ -72,8 +72,8 @@ return view.extend({

var m, s, o;

m = new form.Map('upnpd', [_('Universal Plug & Play')],
_('UPnP allows clients in the local network to automatically configure the router.'));
m = new form.Map('upnpd', [_('UPnP IGD & PCP/NAT-PMP Service')],
_('UPnP IGD & PCP/NAT-PMP allows clients on the local network to automatically configure port forwards on the router. Also called Universal Plug and Play.'));

s = m.section(form.GridSection, '_active_rules');

Expand Down Expand Up @@ -107,43 +107,43 @@ return view.extend({
];
});

cbi_update_table(table, rows, E('em', _('There are no active redirects.')));
cbi_update_table(table, rows, E('em', _('There are no active port forwards.')));

return E('div', { 'class': 'cbi-section cbi-tblsection' }, [
E('h3', _('Active UPnP Redirects')), table ]);
E('h3', _('Active Port Forwards')), table ]);
}, o, this);

s = m.section(form.NamedSection, 'config', 'upnpd', _('MiniUPnP settings'));
s = m.section(form.NamedSection, 'config', 'upnpd', _('Service Settings'));
s.addremove = false;
s.tab('general', _('General Settings'));
s.tab('advanced', _('Advanced Settings'));

o = s.taboption('general', form.Flag, 'enabled', _('Start UPnP and NAT-PMP service'));
o = s.taboption('general', form.Flag, 'enabled', _('Start service'));
o.rmempty = false;

s.taboption('general', form.Flag, 'enable_upnp', _('Enable UPnP functionality')).default = '1'
s.taboption('general', form.Flag, 'enable_natpmp', _('Enable NAT-PMP functionality')).default = '1'
s.taboption('general', form.Flag, 'enable_upnp', _('Enable UPnP IGD protocol')).default = '1'
s.taboption('general', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocol')).default = '1'

s.taboption('general', form.Flag, 'secure_mode', _('Enable secure mode'),
_('Allow adding forwards only to requesting ip addresses')).default = '1'
_('Allow adding port forwards only to requesting IP addresses')).default = '1'

s.taboption('general', form.Flag, 'igdv1', _('Enable IGDv1 mode'),
_('Advertise as IGDv1 device instead of IGDv2')).default = '0'
s.taboption('general', form.Flag, 'igdv1', _('Enable UPnP IGDv1 mode'),
_('Advertise as UPnP IGDv1 device (no IPv6) instead of IGDv2')).default = '0'

s.taboption('general', form.Flag, 'log_output', _('Enable additional logging'),
_('Puts extra debugging information into the system log'))

s.taboption('general', form.Value, 'download', _('Downlink'),
s.taboption('general', form.Value, 'download', _('Download speed'),
_('Value in KByte/s, informational only')).rmempty = true

s.taboption('general', form.Value, 'upload', _('Uplink'),
s.taboption('general', form.Value, 'upload', _('Upload speed'),
_('Value in KByte/s, informational only')).rmempty = true

o = s.taboption('general', form.Value, 'port', _('Port'))
o.datatype = 'port'
o.default = 5000

s.taboption('advanced', form.Flag, 'system_uptime', _('Report system instead of daemon uptime')).default = '1'
s.taboption('advanced', form.Flag, 'system_uptime', _('Report system instead of service uptime')).default = '1'

s.taboption('advanced', form.Value, 'uuid', _('Device UUID'))
s.taboption('advanced', form.Value, 'serial_number', _('Announced serial number'))
Expand All @@ -164,7 +164,7 @@ return view.extend({
o = s.taboption('advanced', form.Value, 'presentation_url', _('Presentation URL'))
o.placeholder = 'http://192.168.1.1/'

o = s.taboption('advanced', form.Value, 'upnp_lease_file', _('UPnP lease file'))
o = s.taboption('advanced', form.Value, 'upnp_lease_file', _('Service lease file'))
o.placeholder = '/var/run/miniupnpd.leases'

s.taboption('advanced', form.Flag, 'use_stun', _('Use STUN'))
Expand All @@ -178,24 +178,24 @@ return view.extend({
o.datatype = 'port'
o.placeholder = '0-65535'

s = m.section(form.GridSection, 'perm_rule', _('MiniUPnP ACLs'),
_('ACLs specify which external ports may be redirected to which internal addresses and ports'))
s = m.section(form.GridSection, 'perm_rule', _('Service ACLs'),
_('ACLs specify which external ports can be forwarded to which client addresses and ports, IPv6 always allowed.'))

s.sortable = true
s.anonymous = true
s.addremove = true

s.option(form.Value, 'comment', _('Comment'))

o = s.option(form.Value, 'ext_ports', _('External ports'))
o = s.option(form.Value, 'ext_ports', _('External Port'))
o.datatype = 'portrange'
o.placeholder = '0-65535'

o = s.option(form.Value, 'int_addr', _('Internal addresses'))
o = s.option(form.Value, 'int_addr', _('Client Address'))
o.datatype = 'ip4addr'
o.placeholder = '0.0.0.0/0'

o = s.option(form.Value, 'int_ports', _('Internal ports'))
o = s.option(form.Value, 'int_ports', _('Client Port'))
o.datatype = 'portrange'
o.placeholder = '0-65535'

Expand Down
87 changes: 39 additions & 48 deletions applications/luci-app-upnp/po/ar/upnp.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:182
msgid ""
"ACLs specify which external ports may be redirected to which internal "
"addresses and ports"
"ACLs specify which external ports can be forwarded to which client addresses "
"and ports, IPv6 always allowed."
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:202
Expand All @@ -27,23 +27,23 @@ msgstr "إجراء"

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:31
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
msgid "Active UPnP Redirects"
msgid "Active Port Forwards"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:119
msgid "Advanced Settings"
msgstr "إعدادات متقدمة"

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
msgid "Advertise as IGDv1 device instead of IGDv2"
msgid "Advertise as UPnP IGDv1 device (no IPv6) instead of IGDv2"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:203
msgid "Allow"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
msgid "Allow adding forwards only to requesting ip addresses"
msgid "Allow adding port forwards only to requesting IP addresses"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:150
Expand All @@ -64,11 +64,13 @@ msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:194
msgid "Client Address"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:47
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:87
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:198
msgid "Client Port"
msgstr ""

Expand Down Expand Up @@ -96,19 +98,19 @@ msgid "Device UUID"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
msgid "Downlink"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
msgid "Enable IGDv1 mode"
msgid "Download speed"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
msgid "Enable NAT-PMP functionality"
msgid "Enable PCP/NAT-PMP protocol"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
msgid "Enable UPnP functionality"
msgid "Enable UPnP IGD protocol"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
msgid "Enable UPnP IGDv1 mode"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
Expand All @@ -121,42 +123,23 @@ msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
msgid "External Port"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:190
msgid "External ports"
msgid "External Port"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
msgid "General Settings"
msgstr "الاعدادات العامة"

#: applications/luci-app-upnp/root/usr/share/rpcd/acl.d/luci-app-upnp.json:3
msgid "Grant access to upnp procedures"
msgid "Grant access to UPnP IGD & PCP/NAT-PMP"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:86
msgid "Host"
msgstr "ضيف"

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:194
msgid "Internal addresses"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:198
msgid "Internal ports"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:181
msgid "MiniUPnP ACLs"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
msgid "MiniUPnP settings"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:152
msgid "Notify interval"
msgstr ""
Expand All @@ -179,7 +162,7 @@ msgid "Puts extra debugging information into the system log"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
msgid "Report system instead of daemon uptime"
msgid "Report system instead of service uptime"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:172
Expand All @@ -190,32 +173,40 @@ msgstr ""
msgid "STUN Port"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:181
msgid "Service ACLs"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
msgid "Service Settings"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
msgid "Service lease file"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
msgid "Start UPnP and NAT-PMP service"
msgid "Start service"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:70
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:66
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
msgid "There are no active redirects."
msgid "There are no active port forwards."
msgstr ""

#: applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json:3
msgid "UPnP"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:76
msgid ""
"UPnP allows clients in the local network to automatically configure the "
"router."
msgid "UPnP IGD & PCP/NAT-PMP"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
msgid "UPnP lease file"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:75
msgid "UPnP IGD & PCP/NAT-PMP Service"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:75
msgid "Universal Plug & Play"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:76
msgid ""
"UPnP IGD & PCP/NAT-PMP allows clients on the local network to automatically "
"configure port forwards on the router. Also called Universal Plug and Play."
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:60
Expand All @@ -225,7 +216,7 @@ msgid "Unknown"
msgstr "مجهول"

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
msgid "Uplink"
msgid "Upload speed"
msgstr ""

#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:170
Expand Down
Loading

0 comments on commit 78d0c7e

Please sign in to comment.