diff options
64 files changed, 259 insertions, 202 deletions
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po index ad0cc1f297..d9a3861e6b 100644 --- a/applications/luci-app-firewall/po/de/firewall.po +++ b/applications/luci-app-firewall/po/de/firewall.po @@ -194,7 +194,7 @@ msgstr "Protokollierung innerhalb der Zone aktivieren" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:43 msgid "Experimental feature. Not fully compatible with QoS/SQM." -msgstr "" +msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM." #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:98 msgid "External IP address" @@ -259,7 +259,7 @@ msgstr "Weiterleiten an" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:343 msgid "Friday" -msgstr "" +msgstr "Freitag" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:90 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:106 @@ -296,7 +296,7 @@ msgstr "Allgemein" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:51 msgid "Hardware flow offloading" -msgstr "" +msgstr "Hardwarebeschleunigte Flusskontrolle" #: applications/luci-app-firewall/luasrc/tools/firewall.lua:75 msgid "IP" @@ -411,11 +411,11 @@ msgstr "Selektiert eingehenden Verkehr nach den angegebenen Quell-Ports." #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:339 msgid "Monday" -msgstr "" +msgstr "Montag" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:346 msgid "Month Days" -msgstr "" +msgstr "Monatstage" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:36 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:50 @@ -541,7 +541,7 @@ msgstr "" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:52 msgid "Requires hardware NAT support. Implemented at least for mt7621" -msgstr "" +msgstr "Erfordert Hardware-NAT-Unterstützung. (Zumindest für mt7621 implementiert)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/custom.lua:29 msgid "Restart Firewall" @@ -582,15 +582,15 @@ msgstr "Schreibe um auf Quell-%s, %s" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:42 msgid "Routing/NAT Offloading" -msgstr "" +msgstr "Routing/NAT-Beschleunigung" #: applications/luci-app-firewall/luasrc/tools/firewall.lua:245 msgid "Rule is disabled" -msgstr "" +msgstr "Regel ist deaktiviert" #: applications/luci-app-firewall/luasrc/tools/firewall.lua:241 msgid "Rule is enabled" -msgstr "" +msgstr "Regel ist aktiviert" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:131 msgid "SNAT IP address" @@ -602,15 +602,15 @@ msgstr "SNAT-Port" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:344 msgid "Saturday" -msgstr "" +msgstr "Samstag" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:47 msgid "Software based offloading for routing/NAT" -msgstr "" +msgstr "Softwarebasierte Auslagerung für Routing/NAT" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:46 msgid "Software flow offloading" -msgstr "" +msgstr "Beschleunigte Flusskontrolle" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forward-details.lua:74 #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:79 @@ -656,23 +656,23 @@ msgstr "Quell-Zone" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:357 msgid "Start Date (yyyy-mm-dd)" -msgstr "" +msgstr "Startdatum (JJJJ-MM-TT)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:353 msgid "Start Time (hh:mm:ss)" -msgstr "" +msgstr "Startzeit (hh:mm:ss)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:359 msgid "Stop Date (yyyy-mm-dd)" -msgstr "" +msgstr "Enddatum (JJJJ-MM-TT)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:355 msgid "Stop Time (hh:mm:ss)" -msgstr "" +msgstr "Endzeit (hh:mm:ss)" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:338 msgid "Sunday" -msgstr "" +msgstr "Sonntag" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/zones.lua:12 msgid "" @@ -735,11 +735,11 @@ msgstr "" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:342 msgid "Thursday" -msgstr "" +msgstr "Donnerstag" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:362 msgid "Time in UTC" -msgstr "" +msgstr "Zeit ist UTC" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:141 msgid "To %s at %s on <var>this device</var>" @@ -784,19 +784,19 @@ msgstr "" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:340 msgid "Tuesday" -msgstr "" +msgstr "Dienstag" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:244 msgid "Unnamed SNAT" -msgstr "" +msgstr "Unbennante SNAT-Regel" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:67 msgid "Unnamed forward" -msgstr "" +msgstr "Unbenannte Portweiterleitung" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rules.lua:76 msgid "Unnamed rule" -msgstr "" +msgstr "Unbennante Regel" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/forwards.lua:101 msgid "Via %s" @@ -808,11 +808,11 @@ msgstr "Über %s an %s" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:341 msgid "Wednesday" -msgstr "" +msgstr "Mittwoch" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:335 msgid "Week Days" -msgstr "" +msgstr "Wochentage" #: applications/luci-app-firewall/luasrc/model/cbi/firewall/rule-details.lua:55 msgid "" diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js index 2c0c460d15..20fbf430be 100644 --- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js +++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js @@ -162,7 +162,7 @@ function display(pattern) 'class': 'btn cbi-button-negative', 'data-package': name, 'click': handleRemove - }, _('Remove')); + }, _('Remove…')); } else { var inst = packages.installed.pkgs[name]; @@ -737,7 +737,7 @@ function handleRemove(ev) 'data-package': name, 'class': 'btn cbi-button-negative', 'click': handleOpkg - }, _('Remove…')) + }, _('Remove')) ]) ]) ]); diff --git a/applications/luci-app-opkg/po/ca/opkg.po b/applications/luci-app-opkg/po/ca/opkg.po index 8e0a701ba4..b15c51684e 100644 --- a/applications/luci-app-opkg/po/ca/opkg.po +++ b/applications/luci-app-opkg/po/ca/opkg.po @@ -193,16 +193,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Treu" +msgid "Remove…" +msgstr "Treu…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Treu…" +msgid "Remove" +msgstr "Treu" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/cs/opkg.po b/applications/luci-app-opkg/po/cs/opkg.po index 524b9b6fb7..a93ddb9f24 100644 --- a/applications/luci-app-opkg/po/cs/opkg.po +++ b/applications/luci-app-opkg/po/cs/opkg.po @@ -187,16 +187,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "Opravdu se pokusíte nainstalovat <em>%h</em>?" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Odstranit" +msgid "Remove…" +msgstr "Odstranit…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "Odstraňte balíček <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Odstranit…" +msgid "Remove" +msgstr "Odstranit" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/de/opkg.po b/applications/luci-app-opkg/po/de/opkg.po index eb79718976..5efd9a0dfb 100644 --- a/applications/luci-app-opkg/po/de/opkg.po +++ b/applications/luci-app-opkg/po/de/opkg.po @@ -191,16 +191,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "Soll wirklich versucht werden, <em>%h</em> zu installieren?" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Entfernen" +msgid "Remove…" +msgstr "Entfernen…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "Paket <em>%h</em> entfernen" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Entfernen…" +msgid "Remove" +msgstr "Entfernen" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/el/opkg.po b/applications/luci-app-opkg/po/el/opkg.po index 3fa5a2a972..647c8e43d0 100644 --- a/applications/luci-app-opkg/po/el/opkg.po +++ b/applications/luci-app-opkg/po/el/opkg.po @@ -193,16 +193,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Αφαίρεση" +msgid "Remove…" +msgstr "Αφαίρεση…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Αφαίρεση…" +msgid "Remove" +msgstr "Αφαίρεση" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/en/opkg.po b/applications/luci-app-opkg/po/en/opkg.po index 44d9d87f85..49422f6e15 100644 --- a/applications/luci-app-opkg/po/en/opkg.po +++ b/applications/luci-app-opkg/po/en/opkg.po @@ -182,7 +182,7 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" +msgid "Remove…" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 @@ -190,7 +190,7 @@ msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" +msgid "Remove" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 diff --git a/applications/luci-app-opkg/po/es/opkg.po b/applications/luci-app-opkg/po/es/opkg.po index 5dc936a14f..aa4c5c0f1a 100644 --- a/applications/luci-app-opkg/po/es/opkg.po +++ b/applications/luci-app-opkg/po/es/opkg.po @@ -189,16 +189,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "¿Realmente intentas instalar <em>%h</em>?" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Desinstalar" +msgid "Remove…" +msgstr "Desinstalar…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "Eliminar paquete <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "" +msgid "Remove" +msgstr "Desinstalar" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/fr/opkg.po b/applications/luci-app-opkg/po/fr/opkg.po index 4c44679009..c1b014a5db 100644 --- a/applications/luci-app-opkg/po/fr/opkg.po +++ b/applications/luci-app-opkg/po/fr/opkg.po @@ -193,16 +193,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Désinstaller" +msgid "Remove…" +msgstr "Désinstaller…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Désinstaller…" +msgid "Remove" +msgstr "Désinstaller" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/he/opkg.po b/applications/luci-app-opkg/po/he/opkg.po index cad99287c6..96cabcf3a9 100644 --- a/applications/luci-app-opkg/po/he/opkg.po +++ b/applications/luci-app-opkg/po/he/opkg.po @@ -189,7 +189,7 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" +msgid "Remove…" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 @@ -197,7 +197,7 @@ msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" +msgid "Remove" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 diff --git a/applications/luci-app-opkg/po/hu/opkg.po b/applications/luci-app-opkg/po/hu/opkg.po index 8c8575bb3f..038248c113 100644 --- a/applications/luci-app-opkg/po/hu/opkg.po +++ b/applications/luci-app-opkg/po/hu/opkg.po @@ -191,16 +191,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Eltávolítás" +msgid "Remove…" +msgstr "Eltávolítás…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Eltávolítás…" +msgid "Remove" +msgstr "Eltávolítás" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/it/opkg.po b/applications/luci-app-opkg/po/it/opkg.po index e35d09e383..1e94abfe39 100644 --- a/applications/luci-app-opkg/po/it/opkg.po +++ b/applications/luci-app-opkg/po/it/opkg.po @@ -193,16 +193,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Rimuovi" +msgid "Remove…" +msgstr "Rimuovi…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Rimuovi…" +msgid "Remove" +msgstr "Rimuovi" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/ja/opkg.po b/applications/luci-app-opkg/po/ja/opkg.po index c757928367..851a5bede1 100644 --- a/applications/luci-app-opkg/po/ja/opkg.po +++ b/applications/luci-app-opkg/po/ja/opkg.po @@ -188,16 +188,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "<em>%h</em> のインストールを試行してもよろしいですか？" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "削除" +msgid "Remove…" +msgstr "削除…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "<em>%h</em> パッケージを削除" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "削除…" +msgid "Remove" +msgstr "削除" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/ko/opkg.po b/applications/luci-app-opkg/po/ko/opkg.po index 37c30fa253..98b4884e77 100644 --- a/applications/luci-app-opkg/po/ko/opkg.po +++ b/applications/luci-app-opkg/po/ko/opkg.po @@ -192,16 +192,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "제거" +msgid "Remove…" +msgstr "제거…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "제거…" +msgid "Remove" +msgstr "제거" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/ms/opkg.po b/applications/luci-app-opkg/po/ms/opkg.po index a4b05343e1..123959f5cc 100644 --- a/applications/luci-app-opkg/po/ms/opkg.po +++ b/applications/luci-app-opkg/po/ms/opkg.po @@ -193,16 +193,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Menghapuskan" +msgid "Remove…" +msgstr "Menghapuskan…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Menghapuskan…" +msgid "Remove" +msgstr "Menghapuskan" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/no/opkg.po b/applications/luci-app-opkg/po/no/opkg.po index d941e2ae6c..26ec3833e0 100644 --- a/applications/luci-app-opkg/po/no/opkg.po +++ b/applications/luci-app-opkg/po/no/opkg.po @@ -188,16 +188,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Avinstaller" +msgid "Remove…" +msgstr "Avinstaller…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Avinstaller…" +msgid "Remove" +msgstr "Avinstaller" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/pl/opkg.po b/applications/luci-app-opkg/po/pl/opkg.po index 7472c88b05..9e8a5e8c3e 100644 --- a/applications/luci-app-opkg/po/pl/opkg.po +++ b/applications/luci-app-opkg/po/pl/opkg.po @@ -202,16 +202,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "Czy na pewno chcesz zainstalować pakiet <em>%h</em>?" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Usuń" +msgid "Remove…" +msgstr "Usuń…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "Usuń pakiet <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Usuń…" +msgid "Remove" +msgstr "Usuń" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/pt-br/opkg.po b/applications/luci-app-opkg/po/pt-br/opkg.po index 98cbf5c9dd..3bb622645e 100644 --- a/applications/luci-app-opkg/po/pt-br/opkg.po +++ b/applications/luci-app-opkg/po/pt-br/opkg.po @@ -194,16 +194,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Remover" +msgid "Remove…" +msgstr "Remover…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Remover…" +msgid "Remove" +msgstr "Remover" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/pt/opkg.po b/applications/luci-app-opkg/po/pt/opkg.po index 3805fbe1d6..5726f02f4b 100644 --- a/applications/luci-app-opkg/po/pt/opkg.po +++ b/applications/luci-app-opkg/po/pt/opkg.po @@ -193,16 +193,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Remover" +msgid "Remove…" +msgstr "Remover…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Remover…" +msgid "Remove" +msgstr "Remover" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/ro/opkg.po b/applications/luci-app-opkg/po/ro/opkg.po index d81f922049..7f60665667 100644 --- a/applications/luci-app-opkg/po/ro/opkg.po +++ b/applications/luci-app-opkg/po/ro/opkg.po @@ -192,16 +192,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Elimina" +msgid "Remove…" +msgstr "Elimina…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Elimina…" +msgid "Remove" +msgstr "Elimina" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po index 6d9ad1a912..7a1f81d0a0 100644 --- a/applications/luci-app-opkg/po/ru/opkg.po +++ b/applications/luci-app-opkg/po/ru/opkg.po @@ -191,16 +191,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "Вы действительно хотите установить <em>%h</em>?" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Удалить" +msgid "Remove…" +msgstr "Удалить…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "Удалить пакет <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Удалить…" +msgid "Remove" +msgstr "Удалить" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/sk/opkg.po b/applications/luci-app-opkg/po/sk/opkg.po index 7f20b00421..f39e7c54da 100644 --- a/applications/luci-app-opkg/po/sk/opkg.po +++ b/applications/luci-app-opkg/po/sk/opkg.po @@ -178,7 +178,7 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" +msgid "Remove…" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 @@ -186,7 +186,7 @@ msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" +msgid "Remove" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 diff --git a/applications/luci-app-opkg/po/sv/opkg.po b/applications/luci-app-opkg/po/sv/opkg.po index 1ca223f627..488b164f71 100644 --- a/applications/luci-app-opkg/po/sv/opkg.po +++ b/applications/luci-app-opkg/po/sv/opkg.po @@ -191,16 +191,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Ta bort" +msgid "Remove…" +msgstr "Ta bort…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Ta bort…" +msgid "Remove" +msgstr "Ta bort" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/templates/opkg.pot b/applications/luci-app-opkg/po/templates/opkg.pot index ccd349e1ca..2631ec0201 100644 --- a/applications/luci-app-opkg/po/templates/opkg.pot +++ b/applications/luci-app-opkg/po/templates/opkg.pot @@ -170,7 +170,7 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" +msgid "Remove…" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 @@ -178,7 +178,7 @@ msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" +msgid "Remove" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 diff --git a/applications/luci-app-opkg/po/tr/opkg.po b/applications/luci-app-opkg/po/tr/opkg.po index efe286e30b..9b6e8dabbb 100644 --- a/applications/luci-app-opkg/po/tr/opkg.po +++ b/applications/luci-app-opkg/po/tr/opkg.po @@ -185,7 +185,7 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" +msgid "Remove…" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 @@ -193,7 +193,7 @@ msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" +msgid "Remove" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 diff --git a/applications/luci-app-opkg/po/uk/opkg.po b/applications/luci-app-opkg/po/uk/opkg.po index 52a209d13b..554ed583a7 100644 --- a/applications/luci-app-opkg/po/uk/opkg.po +++ b/applications/luci-app-opkg/po/uk/opkg.po @@ -185,16 +185,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "Дійсно спробувати інсталювати <em>%h</em>?" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Видалити" +msgid "Remove…" +msgstr "Видалити…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "Видалити пакет <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Видалити…" +msgid "Remove" +msgstr "Видалити" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/vi/opkg.po b/applications/luci-app-opkg/po/vi/opkg.po index 22afb4ec8d..8a8ba0b59e 100644 --- a/applications/luci-app-opkg/po/vi/opkg.po +++ b/applications/luci-app-opkg/po/vi/opkg.po @@ -192,16 +192,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "Loại bỏ" +msgid "Remove…" +msgstr "Loại bỏ…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "Loại bỏ…" +msgid "Remove" +msgstr "Loại bỏ" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/zh-cn/opkg.po b/applications/luci-app-opkg/po/zh-cn/opkg.po index b268aa6e27..e027dc7938 100644 --- a/applications/luci-app-opkg/po/zh-cn/opkg.po +++ b/applications/luci-app-opkg/po/zh-cn/opkg.po @@ -185,16 +185,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "真的要安装 <em>%h</em> 吗？" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "移除" +msgid "Remove…" +msgstr "移除…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "移除软件包 <em>%h</em>" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "移除…" +msgid "Remove" +msgstr "移除" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-opkg/po/zh-tw/opkg.po b/applications/luci-app-opkg/po/zh-tw/opkg.po index 8d432af0d6..7fd5d77aa1 100644 --- a/applications/luci-app-opkg/po/zh-tw/opkg.po +++ b/applications/luci-app-opkg/po/zh-tw/opkg.po @@ -191,16 +191,16 @@ msgid "Really attempt to install <em>%h</em>?" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:165 -msgid "Remove" -msgstr "移除" +msgid "Remove…" +msgstr "移除…" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:718 msgid "Remove package <em>%h</em>" msgstr "" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:740 -msgid "Remove…" -msgstr "移除…" +msgid "Remove" +msgstr "移除" #: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:568 msgid "Require approx. %.1024mB size for %d package(s) to install." diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua index 3179da63b5..bcee6efe08 100644 --- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua +++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/ping.lua @@ -20,6 +20,14 @@ hosts = s:option( Value, "Hosts", translate("Monitor hosts"), translate ("Add mu hosts.default = "127.0.0.1" hosts:depends( "enable", 1 ) +-- collectd_ping.adressfamily (AddressFamily) +addressfamily = s:option( ListValue, "AddressFamily", translate("Address family") ) +addressfamily.default = "any" +addressfamily:value( "any" ) +addressfamily:value( "ipv4" ) +addressfamily:value( "ipv6" ) +addressfamily:depends( "enable", 1 ) + -- collectd_ping.ttl (TTL) ttl = s:option( Value, "TTL", translate("TTL for ping packets") ) ttl.isinteger = true diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig index 55cc6979e5..cb091ae672 100755 --- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig @@ -411,7 +411,7 @@ plugins = { }, ping = { - { "TTL", "Interval" }, + { "TTL", "Interval", "AddressFamily" }, { }, { "Hosts" } }, diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index bb4c67fe88..cd186c94d2 100644 --- a/modules/luci-base/luasrc/sys.lua +++ b/modules/luci-base/luasrc/sys.lua @@ -443,11 +443,11 @@ function process.list() for line in ps do local pid, ppid, user, stat, vsz, mem, cpu, cmd = line:match( - "^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][W ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)" + "^ *(%d+) +(%d+) +(%S.-%S) +([RSDZTW][<NW ][<N ]) +(%d+) +(%d+%%) +(%d+%%) +(.+)" ) local idx = tonumber(pid) - if idx then + if idx and not cmd:match("top %-bn1") then data[idx] = { ['PID'] = pid, ['PPID'] = ppid, diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po index 8e3871fa25..9d1f700022 100644 --- a/modules/luci-base/po/ca/base.po +++ b/modules/luci-base/po/ca/base.po @@ -1197,7 +1197,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2142,7 +2142,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po index 2ab06f4e5c..c8aa77055b 100644 --- a/modules/luci-base/po/cs/base.po +++ b/modules/luci-base/po/cs/base.po @@ -1193,7 +1193,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2144,7 +2144,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po index 0983eb4a0a..9d43411800 100644 --- a/modules/luci-base/po/de/base.po +++ b/modules/luci-base/po/de/base.po @@ -1235,7 +1235,7 @@ msgstr "" "Werkseinstellungen zurückgesetzt werden." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2203,7 +2203,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "Anzahl Header-Error-Code-Fehler (HEC)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po index 25a8f34ea3..d12f7b8763 100644 --- a/modules/luci-base/po/el/base.po +++ b/modules/luci-base/po/el/base.po @@ -1202,7 +1202,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2158,7 +2158,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po index 5da6daf19a..c279d69e49 100644 --- a/modules/luci-base/po/en/base.po +++ b/modules/luci-base/po/en/base.po @@ -1190,7 +1190,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2134,7 +2134,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po index ff174872a5..988cc729b7 100644 --- a/modules/luci-base/po/es/base.po +++ b/modules/luci-base/po/es/base.po @@ -1235,7 +1235,7 @@ msgstr "" "sistema. Para evitar esto, primero realice un restablecimiento de fábrica." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "Intervalo de flash personalizado (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2204,7 +2204,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "Errores de código de error de encabezado (HEC)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "Intervalo de ritmo (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po index 39ce9b54d2..20d61cc82a 100644 --- a/modules/luci-base/po/fr/base.po +++ b/modules/luci-base/po/fr/base.po @@ -1205,7 +1205,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2165,7 +2165,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po index 8fbc29f323..26b60e9599 100644 --- a/modules/luci-base/po/he/base.po +++ b/modules/luci-base/po/he/base.po @@ -1184,7 +1184,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2120,7 +2120,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po index 83e5f83097..3e732e157e 100644 --- a/modules/luci-base/po/hu/base.po +++ b/modules/luci-base/po/hu/base.po @@ -1200,7 +1200,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2154,7 +2154,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po index 73c63ebeb7..59d970e353 100644 --- a/modules/luci-base/po/it/base.po +++ b/modules/luci-base/po/it/base.po @@ -1206,7 +1206,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2159,7 +2159,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po index cddf5c38c2..eb51ebc055 100644 --- a/modules/luci-base/po/ja/base.po +++ b/modules/luci-base/po/ja/base.po @@ -1216,7 +1216,7 @@ msgstr "" "防ぐには、まず最初に factory-reset を行います。" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "カスタムな点滅間隔 (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2177,7 +2177,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "ハートビート (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po index 8f0efb9897..0756e8cac5 100644 --- a/modules/luci-base/po/ko/base.po +++ b/modules/luci-base/po/ko/base.po @@ -1184,7 +1184,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2128,7 +2128,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index ee09ed1535..a95ffe18ff 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -1169,7 +1169,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2105,7 +2105,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po index ad06b299c3..59d88734d2 100644 --- a/modules/luci-base/po/no/base.po +++ b/modules/luci-base/po/no/base.po @@ -1190,7 +1190,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2141,7 +2141,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po index d821840288..89a035d34e 100644 --- a/modules/luci-base/po/pl/base.po +++ b/modules/luci-base/po/pl/base.po @@ -1222,7 +1222,7 @@ msgstr "" "temu, wykonaj najpierw reset do ustawień fabrycznych" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "Własny interwał flash (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2184,7 +2184,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "Błędy kodu nagłówka (HEC)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "Interwał Heartbeata (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po index 7a1702d9a3..f2a8cc9bf2 100644 --- a/modules/luci-base/po/pt-br/base.po +++ b/modules/luci-base/po/pt-br/base.po @@ -1254,7 +1254,7 @@ msgstr "" "Para evitar isso, restaure antes as configurações inicias." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2246,7 +2246,7 @@ msgstr "" "abbr>)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po index e4310b04c0..27262da7c6 100644 --- a/modules/luci-base/po/pt/base.po +++ b/modules/luci-base/po/pt/base.po @@ -1203,7 +1203,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2159,7 +2159,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po index 87ca8800e8..34c768d9bf 100644 --- a/modules/luci-base/po/ro/base.po +++ b/modules/luci-base/po/ro/base.po @@ -1179,7 +1179,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2112,7 +2112,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index e413bcda90..1f6c5fb368 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -1242,7 +1242,7 @@ msgstr "" "Чтобы этого не произошло, выполните сначала сброс к заводским настройкам." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "Произвольный интервал мигания (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2206,7 +2206,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "Ошибки контроля ошибок заголовка (HEC)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "Интервал heartbeat (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po index 37c1e66798..ce1a8bbaf1 100644 --- a/modules/luci-base/po/sk/base.po +++ b/modules/luci-base/po/sk/base.po @@ -1163,7 +1163,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2093,7 +2093,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po index 8192b58686..f60b439b1a 100644 --- a/modules/luci-base/po/sv/base.po +++ b/modules/luci-base/po/sv/base.po @@ -1176,7 +1176,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2112,7 +2112,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po index f93879c630..1b76aa5df6 100644 --- a/modules/luci-base/po/tr/base.po +++ b/modules/luci-base/po/tr/base.po @@ -1178,7 +1178,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2110,7 +2110,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po index 2c6c6723e9..14b886fc63 100644 --- a/modules/luci-base/po/uk/base.po +++ b/modules/luci-base/po/uk/base.po @@ -1248,7 +1248,7 @@ msgstr "" "початкового стану." #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "Користувацький інтервал спалаху (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2218,7 +2218,7 @@ msgstr "" "abbr>)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "Інтервал пульсації (%s)" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po index 62b7a66ea3..1544de4527 100644 --- a/modules/luci-base/po/vi/base.po +++ b/modules/luci-base/po/vi/base.po @@ -1169,7 +1169,7 @@ msgid "" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2110,7 +2110,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po index c7a9e14d25..d22897f4e9 100644 --- a/modules/luci-base/po/zh-cn/base.po +++ b/modules/luci-base/po/zh-cn/base.po @@ -1190,7 +1190,7 @@ msgstr "" "自定义文件（证书、脚本）会保留在系统上。若无需保留，请先执行恢复出厂设置。" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "自定义闪烁间隔（%s）" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2134,7 +2134,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "请求头错误代码错误（HEC）" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "心跳间隔（%s）" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po index 581cbdd2ae..b7b80f6ce3 100644 --- a/modules/luci-base/po/zh-tw/base.po +++ b/modules/luci-base/po/zh-tw/base.po @@ -1178,7 +1178,7 @@ msgid "" msgstr "已修改的檔案(如憑證和腳本)可能會殘留在系統中.如果要避免這項問題,您可以先行重設裝置" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52 -msgid "Custom flash intervall (%s)" +msgid "Custom flash interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4 @@ -2121,7 +2121,7 @@ msgid "Header Error Code Errors (HEC)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56 -msgid "Heartbeat intervall (%s)" +msgid "Heartbeat interval (%s)" msgstr "" #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14 diff --git a/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full index 372eb15122..140c832997 100755 --- a/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full +++ b/modules/luci-mod-network/root/etc/uci-defaults/50_luci-mod-admin-full @@ -5,7 +5,7 @@ if [ "$(uci -q get luci.diag)" != "internal" ]; then if [ -s /etc/os-release ]; then . /etc/os-release - host="${HOME_URL:-${BUG_URL:-$LEDE_DEVICE_MANUFACTURER_URL}}" + host="${HOME_URL:-${BUG_URL:-$OPENWRT_DEVICE_MANUFACTURER_URL}}" host="${host#*://}" host="${host%%/*}" fi diff --git a/modules/luci-mod-status/luasrc/view/admin_status/connections.htm b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm index e3dd39d607..37debcde66 100644 --- a/modules/luci-mod-status/luasrc/view/admin_status/connections.htm +++ b/modules/luci-mod-status/luasrc/view/admin_status/connections.htm @@ -131,15 +131,21 @@ } label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3); + + var recheck_lookup_queue = {}; /* render datasets, start update interval */ XHR.poll(3, '<%=build_url("admin/status/realtime/connections_status")%>', null, function(x, json) { - var rows = []; + + if (!json.connections) + return; + var conn = json.connections; var lookup_queue = [ ]; + var rows = []; conn.sort(function(a, b) { return b.bytes - a.bytes; @@ -150,13 +156,13 @@ var c = conn[i]; if ((c.src == '127.0.0.1' && c.dst == '127.0.0.1') || - (c.src == '::1' && c.dst == '::1')) + (c.src == '::1' && c.dst == '::1')) continue; - if (!dns_cache[c.src]) + if (!dns_cache[c.src] && lookup_queue.indexOf(c.src) == -1) lookup_queue.push(c.src); - if (!dns_cache[c.dst]) + if (!dns_cache[c.dst] && lookup_queue.indexOf(c.dst) == -1) lookup_queue.push(c.dst); var src = dns_cache[c.src] || (c.layer3 == 'ipv6' ? '[' + c.src + ']' : c.src); @@ -173,14 +179,39 @@ cbi_update_table(conn_table, rows, '<em><%:No information available%></em>'); - if (lookup_queue.length > 0) - XHR.get('<%=build_url("admin/status/nameinfo")%>/' + lookup_queue.slice(0, 100).join('/'), null, - function(x, json) - { - for (var addr in json) - dns_cache[addr] = json[addr]; + if (lookup_queue.length > 0) { + var reduced_lookup_queue = lookup_queue; + + if (lookup_queue.length > 100) + reduced_lookup_queue = lookup_queue.slice(0, 100); + + XHR.get('<%=build_url("admin/status/nameinfo")%>/' + reduced_lookup_queue.join('/'), null, + function(x, json) { + if (!json) + return; + + for (var index in reduced_lookup_queue) { + var address = reduced_lookup_queue[index]; + + if (!address) + continue; + + if (json[address]) { + dns_cache[address] = json[address]; + lookup_queue.splice(reduced_lookup_queue.indexOf(address),1); + continue; + } + + if(recheck_lookup_queue[address] > 2) { + dns_cache[address] = (address.match(/:/)) ? '[' + address + ']' : address; + lookup_queue.splice(index,1); + } else { + recheck_lookup_queue[address] != null ? recheck_lookup_queue[address]++ : recheck_lookup_queue[address] = 0; + } + } } ); + } var data = json.statistics; diff --git a/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua index 312e74249a..7644cdd439 100644 --- a/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua +++ b/modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua @@ -49,11 +49,11 @@ for t in triggers:gmatch("[%w-]+") do elseif t == "none" then trigger:value(t, translatef("Always off (%s)", t)) elseif t == "timer" then - trigger:value(t, translatef("Custom flash intervall (%s)", t)) + trigger:value(t, translatef("Custom flash interval (%s)", t)) elseif t == "netdev" then trigger:value(t, translatef("Network device activity (%s)", t)) elseif t == "heartbeat" then - trigger:value(t, translatef("Heartbeat intervall (%s)", t)) + trigger:value(t, translatef("Heartbeat interval (%s)", t)) elseif t == "nand-disk" then trigger:value(t, translatef("Flashmemory write access (%s)", t)) elseif t == "mtd" then diff --git a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua index 318db7e774..3fe4ef33aa 100644 --- a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua +++ b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua @@ -12,7 +12,7 @@ You may obtain a copy of the License at local map, section, net = ... -local device, apn, service, pincode, username, password +local device, apn, service, pincode, username, password, dialnum local ipv6, delay, defaultroute, metric, peerdns, dns @@ -57,6 +57,10 @@ password = section:taboption("general", Value, "password", translate("PAP/CHAP p password.password = true +dialnum = section:taboption("general", Value, "dialnum", translate("Dial number")) +dialnum.placeholder = "*99#" + + if luci.model.network:has_ipv6() then ipv6 = section:taboption("advanced", ListValue, "ipv6") diff --git a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua index e11201d213..9cc1ae0cf5 100644 --- a/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua +++ b/protocols/luci-proto-qmi/luasrc/model/cbi/admin_network/proto_qmi.lua @@ -4,7 +4,7 @@ local map, section, net = ... local device, apn, pincode, username, password -local auth, ipv6 +local auth, ipv6, delay device = section:taboption("general", Value, "device", translate("Modem device")) @@ -26,20 +26,34 @@ apn = section:taboption("general", Value, "apn", translate("APN")) pincode = section:taboption("general", Value, "pincode", translate("PIN")) +auth = section:taboption("general", Value, "auth", translate("Authentication Type")) +auth:value("both", "PAP/CHAP (both)") +auth:value("pap", "PAP") +auth:value("chap", "CHAP") +auth:value("none", "NONE") +auth.default = "none" + + username = section:taboption("general", Value, "username", translate("PAP/CHAP username")) +username:depends("auth", "pap") +username:depends("auth", "chap") +username:depends("auth", "both") password = section:taboption("general", Value, "password", translate("PAP/CHAP password")) +password:depends("auth", "pap") +password:depends("auth", "chap") +password:depends("auth", "both") password.password = true -auth = section:taboption("general", Value, "auth", translate("Authentication Type")) -auth:value("", translate("-- Please choose --")) -auth:value("both", "PAP/CHAP (both)") -auth:value("pap", "PAP") -auth:value("chap", "CHAP") -auth:value("none", "NONE") if luci.model.network:has_ipv6() then ipv6 = section:taboption("advanced", Flag, "ipv6", translate("Enable IPv6 negotiation")) ipv6.default = ipv6.disabled end + +delay = section:taboption("advanced", Value, "delay", + translate("Modem init timeout"), + translate("Maximum amount of seconds to wait for the modem to become ready")) +delay.placeholder = "10" +delay.datatype = "min(1)" diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index f463ef5cb2..9521314e1f 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -219,7 +219,7 @@ </div> </header> <div class="main"> - <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div> + <div style="" class="loading"><span><div class="loading-img"></div><%:Collecting data...%></span></div> <div class="main-left"> <% render_topmenu() %> </div> |