diff options
Diffstat (limited to 'modules')
30 files changed, 98 insertions, 67 deletions
diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua index bb4c67fe8..cd186c94d 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 8e3871fa2..9d1f70002 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 2ab06f4e5..c8aa77055 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 0983eb4a0..9d4341180 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 25a8f34ea..d12f7b876 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 5da6daf19..c279d69e4 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 ff174872a..988cc729b 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 39ce9b54d..20d61cc82 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 8fbc29f32..26b60e959 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 83e5f8309..3e732e157 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 73c63ebeb..59d970e35 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 cddf5c38c..eb51ebc05 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 8f0efb989..0756e8cac 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 ee09ed153..a95ffe18f 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 ad06b299c..59d88734d 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 d82184028..89a035d34 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 7a1702d9a..f2a8cc9bf 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 e4310b04c..27262da7c 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 87ca8800e..34c768d9b 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 e413bcda9..1f6c5fb36 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 37c1e6679..ce1a8bbaf 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 8192b5868..f60b439b1 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 f93879c63..1b76aa5df 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 2c6c6723e..14b886fc6 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 62b7a66ea..1544de452 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 c7a9e14d2..d22897f4e 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 581cbdd2a..b7b80f6ce 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 372eb1512..140c83299 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 e3dd39d60..37debcde6 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 312e74249..7644cdd43 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 |