Skip to content

luci-app-upnp: restore some i18n keys #7433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
systemcrash merged 2 commits into from
Nov 30, 2024
Merged

luci-app-upnp: restore some i18n keys #7433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
162275f
luci-app-upnp: remove dangling lines and split translations
stokito Nov 30, 2024
965f6a0
luci-app-upnp: restore translations
stokito Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ return baseclass.extend({
},

render: function(data) {

var table = E('table', { 'class': 'table', 'id': 'upnp_status_table' }, [
E('tr', { 'class': 'tr table-titles' }, [
E('th', { 'class': 'th' }, _('Client Name')),
Expand All @@ -51,7 +50,6 @@ return baseclass.extend({
]);

var rules = Array.isArray(data[0].rules) ? data[0].rules : [];

var rows = rules.map(function(rule) {
return [
rule.host_hint || _('Unknown'),
Expand All @@ -66,9 +64,7 @@ return baseclass.extend({
}, [ _('Delete') ])
];
});

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

return table;
}
});
30 changes: 16 additions & 14 deletions applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ return view.extend({
},

poll_status: function(nodes, data) {

var rules = Array.isArray(data[0].rules) ? data[0].rules : [];

var rows = rules.map(function(rule) {
return [
rule.host_hint || _('Unknown'),
Expand All @@ -62,18 +60,21 @@ return view.extend({
}, [ _('Delete') ])
];
});

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

return;
},

render: function(data) {

var m, s, o;

var protocols = '%s & %s/%s'.format(
'<a href="https://en.wikipedia.org/wiki/Internet_Gateway_Device_Protocol" target="_blank" rel="noreferrer"><abbr title="UPnP Internet Gateway Device (Control Protocol)">UPnP IGD</abbr></a>',
'<a href="https://en.wikipedia.org/wiki/Port_Control_Protocol" target="_blank" rel="noreferrer"><abbr title="Port Control Protocol">PCP</abbr></a>',
'<a href="https://en.wikipedia.org/wiki/NAT_Port_Mapping_Protocol" target="_blank" rel="noreferrer"><abbr title="NAT Port Mapping Protocol">NAT-PMP</abbr></a>');
m = new form.Map('upnpd', [_('UPnP IGD & PCP/NAT-PMP Service')],
_('The %s protocols allow clients on the local network to configure port maps/forwards on the router autonomously.', 'The %s (%s = UPnP IGD & PCP/NAT-PMP) protocols allow clients on the local network to configure port maps/forwards on the router autonomously.').format('%s & %s/%s').format('<a href="https://en.wikipedia.org/wiki/Internet_Gateway_Device_Protocol" target="_blank" rel="noreferrer"><abbr title="UPnP Internet Gateway Device (Control Protocol)">UPnP IGD</abbr></a>', '<a href="https://en.wikipedia.org/wiki/Port_Control_Protocol" target="_blank" rel="noreferrer"><abbr title="Port Control Protocol">PCP</abbr></a>', '<a href="https://en.wikipedia.org/wiki/NAT_Port_Mapping_Protocol" target="_blank" rel="noreferrer"><abbr title="NAT Port Mapping Protocol">NAT-PMP</abbr></a>'));
_('The %s protocols allow clients on the local network to configure port maps/forwards on the router autonomously.',
'The %s (%s = UPnP IGD & PCP/NAT-PMP) protocols allow clients on the local network to configure port maps/forwards on the router autonomously.')
.format(protocols)
);

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

Expand All @@ -91,7 +92,6 @@ return view.extend({
]);

var rules = Array.isArray(data[0].rules) ? data[0].rules : [];

var rows = rules.map(function(rule) {
return [
rule.host_hint || _('Unknown'),
Expand All @@ -106,9 +106,7 @@ return view.extend({
}, [ _('Delete') ])
];
});

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

return E('div', { 'class': 'cbi-section cbi-tblsection' }, [
E('h3', _('Active Service Port Maps')), table ]);
}, o, this);
Expand All @@ -122,9 +120,11 @@ return view.extend({
_('Start autonomous port mapping service'));
o.rmempty = false;

s.taboption('setup', form.Flag, 'enable_upnp', _('Enable UPnP IGD protocol')).default = '1';
s.taboption('setup', form.Flag, 'enable_upnp', _('Enable UPnP IGD protocol'))
s.default = '1';

s.taboption('setup', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocols')).default = '1';
s.taboption('setup', form.Flag, 'enable_natpmp', _('Enable PCP/NAT-PMP protocols'))
s.default = '1';

o = s.taboption('setup', form.Flag, 'igdv1', _('UPnP IGDv1 compatibility mode'),
_('Advertise as IGDv1 (IPv4 only) device instead of IGDv2'));
Expand All @@ -140,7 +140,8 @@ return view.extend({
_('Report maximum upload speed in kByte/s'));
o.depends('enable_upnp', '1');

s.taboption('advanced', form.Flag, 'use_stun', _('Use %s', 'Use %s (%s = STUN)').format('<a href="https://en.wikipedia.org/wiki/STUN" target="_blank" rel="noreferrer"><abbr title="Session Traversal Utilities for NAT">STUN</abbr></a>'),
s.taboption('advanced', form.Flag, 'use_stun', _('Use %s', 'Use %s (%s = STUN)')
.format('<a href="https://en.wikipedia.org/wiki/STUN" target="_blank" rel="noreferrer"><abbr title="Session Traversal Utilities for NAT">STUN</abbr></a>'),
_('To detect the public IPv4 address for unrestricted full-cone/one-to-one NATs'));

o = s.taboption('advanced', form.Value, 'stun_host', _('STUN Host'));
Expand All @@ -158,7 +159,8 @@ return view.extend({
o.depends('enable_upnp', '1');

o = s.taboption('advanced', form.Value, 'notify_interval', _('Notify interval'),
_('A 900s interval will result in %s notifications with the minimum max-age of 1800s', 'A 900s interval will result in %s (%s = SSDP) notifications with the minimum max-age of 1800s').format('<abbr title="Simple Service Discovery Protocol">SSDP</abbr>'));
_('A 900s interval will result in %s notifications with the minimum max-age of 1800s', 'A 900s interval will result in %s (%s = SSDP) notifications with the minimum max-age of 1800s')
.format('<abbr title="Simple Service Discovery Protocol">SSDP</abbr>'));
o.datatype = 'uinteger';
o.placeholder = '900';
o.depends('enable_upnp', '1');
Expand Down
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/cs/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ msgstr "Upload speed"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Použít %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -272,8 +272,5 @@ msgstr ""
#~ msgstr ""
#~ "UPnP umožňuje klientům v místní síti automaticky nakonfigurovat router."

#~ msgid "Use %s"
#~ msgstr "Použít %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Pouze informační hodnoty (v KByte/s)"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/da/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ msgstr "Upload speed"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Brug %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -275,8 +275,5 @@ msgstr ""
#~ "UPnP gør det muligt for klienter i det lokale netværk at konfigurere "
#~ "routeren automatisk."

#~ msgid "Use %s"
#~ msgstr "Brug %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Værdi i KByte/s, kun til information"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/de/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ msgstr "Upload speed"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "%s verwenden"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -275,8 +275,5 @@ msgstr ""
#~ "UPnP erlaubt es Clients im lokalen Netzwerk automatisch Port-"
#~ "Weiterleitungen auf diesem Router einzurichten."

#~ msgid "Use %s"
#~ msgstr "%s verwenden"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Wert in Kilobyte/s, nur informativ"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/es/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ msgstr "Velocidad de carga"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Utilizar %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand Down Expand Up @@ -278,8 +278,5 @@ msgstr ""
#~ "automáticamente el reenvío de puertos en el enrutador. También llamado "
#~ "Plug and Play universal."

#~ msgid "Use %s"
#~ msgstr "Utilizar %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Valor en KBytes/s, sólo informativo"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/fi/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,7 @@ msgstr "Lähetysyhteys"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Käytä %s:ia"

#~ msgid "Host"
#~ msgstr "Palvelin"

#~ msgid "Use %s"
#~ msgstr "Käytä %s:ia"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/fr/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ msgstr "Liaison montante"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Utiliser %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -278,8 +278,5 @@ msgstr ""
#~ "UPnP permet à des clients du réseau local de configurer automatiquement "
#~ "le routeur."

#~ msgid "Use %s"
#~ msgstr "Utiliser %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Valeur en Ko/s, pour information seulement"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/ga/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ msgstr "Luas uaslódála"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Bain úsáid as %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -277,8 +277,5 @@ msgstr ""
#~ "ar aghaidh ar an ródaire a chumrú go huathoibríoch. Tugtar Breiseán "
#~ "Uilíoch agus Súgradh air freisin."

#~ msgid "Use %s"
#~ msgstr "Bain úsáid as %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Luach i KByte/s, eolasach amháin"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/it/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ msgstr "Velocità di upload"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Usa %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -276,8 +276,5 @@ msgstr ""
#~ "automaticamente l'apertura delle porte del router. Anche conosciuto come "
#~ "Universal Plug and Play."

#~ msgid "Use %s"
#~ msgstr "Usa %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Valori in KByte/s (informativo)"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/ja/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ msgstr "アップリンク"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "%s を使用"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -275,8 +275,5 @@ msgstr ""
#~ "UPnPを使用することで、ローカルネットワーク内のクライアントが自動的にルータ"
#~ "を構成することができます。"

#~ msgid "Use %s"
#~ msgstr "%s を使用"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "クライアントへの情報提供のみに使用される、KByte/sの値です"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/lt/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ msgstr "Įkėlimo greitis"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Naudoti „%s“"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -278,8 +278,5 @@ msgstr ""
#~ "automatiškai konfigūruoti prievado persiuntimus maršrutizatoriuje. Taip "
#~ "pat vadinamas – „Universal Plug and Play“."

#~ msgid "Use %s"
#~ msgstr "Naudoti „%s“"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Reikšmė kilobaitais per sekundę (KB/s), tik informacinis"
4 changes: 1 addition & 3 deletions applications/luci-app-upnp/po/nb_NO/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ msgstr "Opplinje"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Bruk %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -271,8 +271,6 @@ msgstr ""
#~ "UPnP gjør at klientene i det lokale nettverket automatisk kan konfigurere "
#~ "ruteren."

#~ msgid "Use %s"
#~ msgstr "Bruk %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Verdi i KByte/sek, kun for informasjon"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/pl/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ msgstr "Prędkość wysyłania"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Użyj %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand Down Expand Up @@ -277,8 +277,5 @@ msgstr ""
#~ "konfigurację przekierowania portów na routerze. Nazywane także Universal "
#~ "Plug and Play."

#~ msgid "Use %s"
#~ msgstr "Użyj %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Wartość w KB/s, tylko informacyjna"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/pt/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ msgstr "Ligação ascendente"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Utilizar %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -276,8 +276,5 @@ msgstr ""
#~ "UPnP permite que os clientes da rede local configurem o router "
#~ "automaticamente."

#~ msgid "Use %s"
#~ msgstr "Utilizar %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Valor em KByte/s, apenas informativo"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/pt_BR/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ msgstr "Velocidade de envio (upload)"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Use o %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -276,8 +276,5 @@ msgstr ""
#~ "UPnP permite os clientes da rede local configurem automaticamente o "
#~ "roteador."

#~ msgid "Use %s"
#~ msgstr "Use o %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Valores em KByte/s, apenas informativas"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/ro/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ msgstr "Legătură ascendentă"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Utilizați %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -274,8 +274,5 @@ msgstr ""
#~ "UPNP permite clientulor din reteaua locala sa configureze automat "
#~ "routerul."

#~ msgid "Use %s"
#~ msgstr "Utilizați %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Valorea in KOcteti/s , doar informational"
5 changes: 1 addition & 4 deletions applications/luci-app-upnp/po/ru/upnp.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ msgstr "Внешнее соединение"
#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
msgctxt "Use %s (%s = STUN)"
msgid "Use %s"
msgstr ""
msgstr "Использовать %s"

#~ msgid ""
#~ "ACLs specify which external ports can be forwarded to which client "
Expand All @@ -277,8 +277,5 @@ msgstr ""
#~ "UPnP позволяет клиентам в локальной сети автоматически настраивать "
#~ "маршрутизатор."

#~ msgid "Use %s"
#~ msgstr "Используйте %s"

#~ msgid "Value in KByte/s, informational only"
#~ msgstr "Значение в КБ/с, только для информации"
Loading