i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

122 files changed, 10006 insertions, 7767 deletions

diff --git a/applications/luci-app-mwan3/po/de/mwan3.po b/applications/luci-app-mwan3/po/de/mwan3.po
index 348ad2545..a38794879 100644
--- a/applications/luci-app-mwan3/po/de/mwan3.po
+++ b/applications/luci-app-mwan3/po/de/mwan3.po
@@ -109,13 +109,13 @@ msgstr "Prüfen der Routing-Tabelle"
 msgid "Collecting data..."
 msgstr "Sammle Daten..."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:80
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 msgid "Destination address"
 msgstr "Zieladresse"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:86
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 msgid "Destination port"
 msgstr "Zielport"
 
@@ -144,8 +144,8 @@ msgstr ""
 "Eine als offline markierte Schnittstelle wird nach dieser Anzahl "
 "erfolgreicher Tracking-Runden als online angesehen"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:158
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -216,8 +216,8 @@ msgid "Initial state"
 msgstr ""
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:62
@@ -226,13 +226,13 @@ msgstr ""
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:206
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 msgid "Interface down"
 msgstr "Schnittstelle nicht aktiv"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:217
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 msgid "Interface up"
 msgstr "Schnittstelle aktiv"
 
@@ -258,8 +258,8 @@ msgstr ""
 msgid "Keep ping failure interval during failure state"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 msgid "Last resort"
 msgstr ""
 
@@ -389,10 +389,10 @@ msgstr ""
 msgid "Members assigned"
 msgstr "Mitglieder, zugewiesen"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:228
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:32
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
 msgid "Metric"
 msgstr "Metrik"
 
@@ -460,8 +460,8 @@ msgstr "Ping-Zähler"
 msgid "Ping default gateway"
 msgstr "Ping-Standard-Gateway"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 msgid "Ping interval"
 msgstr "Ping-Intervall"
 
@@ -504,13 +504,13 @@ msgstr ""
 msgid "Policy"
 msgstr "Richtlinie"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:98
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 msgid "Policy assigned"
 msgstr "Richtlinie, zugewiesen"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:92
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 msgid "Protocol"
 msgstr "Protokoll"
 
@@ -562,13 +562,13 @@ msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
 msgstr ""
 "Sekunden. Gültige Werte: 1-1000000. Standard bei 600 falls nicht gesetzt"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:68
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 msgid "Source address"
 msgstr "Quelladresse"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 msgid "Source port"
 msgstr "Quellport"
 
@@ -634,13 +634,13 @@ msgstr ""
 msgid "Tracking hostname or IP address"
 msgstr "Tracking des Hostnamen oder der IP-Addresse"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 msgid "Tracking method"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 msgid "Tracking reliability"
 msgstr ""
 
@@ -704,8 +704,8 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 msgid "Weight"
 msgstr "Gewichtung"
 
@@ -725,14 +725,14 @@ msgstr "Ja"
 msgid "always"
 msgstr "immer"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:79
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:60
 msgid "blackhole (drop)"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:81
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:61
 msgid "default (use main routing table)"
 msgstr "default (Haupt-Routing-Tabelle wird benutzt)"
@@ -749,8 +749,8 @@ msgstr ""
 msgid "never"
 msgstr "nie"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:83
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
 msgid "unreachable (reject)"
 msgstr "unerreichbar (rejectet)"
diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index 642bda9aa..1920d6bb4 100644
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -120,13 +120,13 @@ msgstr "ルーティング テーブルのチェック"
 msgid "Collecting data..."
 msgstr "データ収集中です..."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:80
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 msgid "Destination address"
 msgstr "宛先アドレス"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:86
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 msgid "Destination port"
 msgstr "宛先ポート"
 
@@ -155,8 +155,8 @@ msgstr ""
 "Down 状態のインターフェースが Up 状態と判断されるまでに要する ping テストの成"
 "功回数です。"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:158
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 msgid "Enabled"
 msgstr "有効"
 
@@ -229,8 +229,8 @@ msgid "Initial state"
 msgstr "初期状態"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:62
@@ -239,13 +239,13 @@ msgstr "初期状態"
 msgid "Interface"
 msgstr "インターフェース"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:206
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 msgid "Interface down"
 msgstr "インターフェース Down"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:217
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 msgid "Interface up"
 msgstr "インターフェース Up"
 
@@ -271,8 +271,8 @@ msgstr ""
 msgid "Keep ping failure interval during failure state"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 msgid "Last resort"
 msgstr "最終手段"
 
@@ -409,10 +409,10 @@ msgstr ""
 msgid "Members assigned"
 msgstr "アサイン済みメンバー"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:228
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:32
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
 msgid "Metric"
 msgstr "メトリック"
 
@@ -480,8 +480,8 @@ msgstr "Ping 回数"
 msgid "Ping default gateway"
 msgstr "Ping デフォルト ゲートウェイ"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 msgid "Ping interval"
 msgstr "Ping インターバル"
 
@@ -532,13 +532,13 @@ msgstr ""
 msgid "Policy"
 msgstr "ポリシー"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:98
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 msgid "Policy assigned"
 msgstr "アサイン済みポリシー"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:92
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -599,13 +599,13 @@ msgstr ""
 msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
 msgstr "秒。利用可能な値: 1-1000000。空欄の場合のデフォルト値は600です。"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:68
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 msgid "Source address"
 msgstr "送信元アドレス"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 msgid "Source port"
 msgstr "送信元ポート"
 
@@ -683,13 +683,13 @@ msgstr ""
 msgid "Tracking hostname or IP address"
 msgstr "追跡ホスト名または IP アドレス"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 msgid "Tracking method"
 msgstr "追跡方式"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 msgid "Tracking reliability"
 msgstr "追跡の信頼性"
 
@@ -760,8 +760,8 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr "コマンドを実行中です..."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 msgid "Weight"
 msgstr "ウエイト"
 
@@ -781,14 +781,14 @@ msgstr "はい"
 msgid "always"
 msgstr "always"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:79
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:60
 msgid "blackhole (drop)"
 msgstr "blackhole (drop)"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:81
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:61
 msgid "default (use main routing table)"
 msgstr "デフォルト（メインのルーティング テーブルを使用）"
@@ -805,8 +805,8 @@ msgstr "ifup"
 msgid "never"
 msgstr "never"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:83
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
 msgid "unreachable (reject)"
 msgstr "unreachable (reject)"
diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po
index 50174d7bc..bb5e01eaf 100644
--- a/applications/luci-app-mwan3/po/ru/mwan3.po
+++ b/applications/luci-app-mwan3/po/ru/mwan3.po
@@ -123,13 +123,13 @@ msgstr "Проверить таблицу маршрутизации"
 msgid "Collecting data..."
 msgstr "Сбор данных..."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:80
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 msgid "Destination address"
 msgstr "Адрес назначения"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:86
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 msgid "Destination port"
 msgstr "Порт назначения"
 
@@ -157,8 +157,8 @@ msgid ""
 msgstr ""
 "Интерфейс будет считаться отключенным, после продолжительных пинг-запросов."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:158
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 msgid "Enabled"
 msgstr "Включено"
 
@@ -231,8 +231,8 @@ msgid "Initial state"
 msgstr "Исходное состояние"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:62
@@ -241,13 +241,13 @@ msgstr "Исходное состояние"
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:206
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 msgid "Interface down"
 msgstr "Интерфейс отключить"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:217
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 msgid "Interface up"
 msgstr "Интерфейс включить"
 
@@ -272,8 +272,8 @@ msgstr "Сохранить интервал сбоя"
 msgid "Keep ping failure interval during failure state"
 msgstr "Сохранить интервал сбоя пинг-запроса, во время состояния сбоя."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 msgid "Last resort"
 msgstr "Последнее средство"
 
@@ -408,10 +408,10 @@ msgstr ""
 msgid "Members assigned"
 msgstr "Назначенные узлы"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:228
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:32
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
 msgid "Metric"
 msgstr "Метрика"
 
@@ -479,8 +479,8 @@ msgstr "Кол-во пинг-запросов"
 msgid "Ping default gateway"
 msgstr "Пинг-запрос шлюза по умолчанию"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 msgid "Ping interval"
 msgstr "Интервал пинг-запроса"
 
@@ -531,13 +531,13 @@ msgstr ""
 msgid "Policy"
 msgstr "Политика"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:98
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 msgid "Policy assigned"
 msgstr "Назначенная политика"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:92
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -601,13 +601,13 @@ msgstr ""
 "Секунд. Допустимые значения: 1-1000000. По умолчанию 600, если значение не "
 "установлено."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:68
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 msgid "Source address"
 msgstr "Адрес источника"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 msgid "Source port"
 msgstr "Порт источника"
 
@@ -671,13 +671,13 @@ msgstr ""
 msgid "Tracking hostname or IP address"
 msgstr "Отслеживание имени хоста или IP-адреса"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 msgid "Tracking method"
 msgstr "Метод отслеживания"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 msgid "Tracking reliability"
 msgstr "Надежность отслеживания"
 
@@ -749,8 +749,8 @@ msgstr "ВНИМАНИЕ: Для правила %s порта не задан п
 msgid "Waiting for command to complete..."
 msgstr "Ожидание завершения выполнения команды..."
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 msgid "Weight"
 msgstr "Вес"
 
@@ -770,14 +770,14 @@ msgstr "Да"
 msgid "always"
 msgstr "всегда"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:79
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:60
 msgid "blackhole (drop)"
 msgstr "blackhole (drop)"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:81
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:61
 msgid "default (use main routing table)"
 msgstr "по умолчанию (использовать основную таблицу маршрутизации)"
@@ -794,8 +794,8 @@ msgstr "ifup"
 msgid "never"
 msgstr "никогда"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:83
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
 msgid "unreachable (reject)"
 msgstr "недоступен (отклонить)"
diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot
index 078c630e0..36c5a3bda 100644
--- a/applications/luci-app-mwan3/po/templates/mwan3.pot
+++ b/applications/luci-app-mwan3/po/templates/mwan3.pot
@@ -107,13 +107,13 @@ msgstr ""
 msgid "Collecting data..."
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:80
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 msgid "Destination address"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:86
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 msgid "Destination port"
 msgstr ""
 
@@ -140,8 +140,8 @@ msgid ""
 "Downed interface will be deemed up after this many successful ping tests"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:158
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 msgid "Enabled"
 msgstr ""
 
@@ -212,8 +212,8 @@ msgid "Initial state"
 msgstr ""
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:62
@@ -222,13 +222,13 @@ msgstr ""
 msgid "Interface"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:206
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 msgid "Interface down"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:217
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 msgid "Interface up"
 msgstr ""
 
@@ -252,8 +252,8 @@ msgstr ""
 msgid "Keep ping failure interval during failure state"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 msgid "Last resort"
 msgstr ""
 
@@ -377,10 +377,10 @@ msgstr ""
 msgid "Members assigned"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:228
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:32
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
 msgid "Metric"
 msgstr ""
 
@@ -446,8 +446,8 @@ msgstr ""
 msgid "Ping default gateway"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 msgid "Ping interval"
 msgstr ""
 
@@ -490,13 +490,13 @@ msgstr ""
 msgid "Policy"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:98
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 msgid "Policy assigned"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:92
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 msgid "Protocol"
 msgstr ""
 
@@ -547,13 +547,13 @@ msgstr ""
 msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:68
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 msgid "Source port"
 msgstr ""
 
@@ -612,13 +612,13 @@ msgstr ""
 msgid "Tracking hostname or IP address"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 msgid "Tracking method"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 msgid "Tracking reliability"
 msgstr ""
 
@@ -679,8 +679,8 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 msgid "Weight"
 msgstr ""
 
@@ -698,14 +698,14 @@ msgstr ""
 msgid "always"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:79
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:60
 msgid "blackhole (drop)"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:81
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:61
 msgid "default (use main routing table)"
 msgstr ""
@@ -722,8 +722,8 @@ msgstr ""
 msgid "never"
 msgstr ""
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:83
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
 msgid "unreachable (reject)"
 msgstr ""
diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
index 14bacdbc4..8bac6a7a7 100644
--- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
@@ -118,13 +118,13 @@ msgstr "检查路由表"
 msgid "Collecting data..."
 msgstr "正在收集数据…"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:80
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 msgid "Destination address"
 msgstr "目标地址"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:86
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 msgid "Destination port"
 msgstr "目标端口"
 
@@ -151,8 +151,8 @@ msgid ""
 "Downed interface will be deemed up after this many successful ping tests"
 msgstr "当 Ping 成功次数达到这个数值后，已经被认为离线的接口将会重新上线"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:158
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 msgid "Enabled"
 msgstr "已启用"
 
@@ -223,8 +223,8 @@ msgid "Initial state"
 msgstr "初始状态"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:62
@@ -233,13 +233,13 @@ msgstr "初始状态"
 msgid "Interface"
 msgstr "接口"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:206
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 msgid "Interface down"
 msgstr "接口离线"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:217
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 msgid "Interface up"
 msgstr "接口在线"
 
@@ -263,8 +263,8 @@ msgstr "保持故障检测间隔"
 msgid "Keep ping failure interval during failure state"
 msgstr "在故障状态期间保持的 Ping 故障检测间隔"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 msgid "Last resort"
 msgstr "备用成员"
 
@@ -397,10 +397,10 @@ msgstr ""
 msgid "Members assigned"
 msgstr "分配的成员"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:228
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:32
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
 msgid "Metric"
 msgstr "跃点数"
 
@@ -468,8 +468,8 @@ msgstr "Ping 计数"
 msgid "Ping default gateway"
 msgstr "Ping 默认网关"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 msgid "Ping interval"
 msgstr "Ping 间隔"
 
@@ -517,13 +517,13 @@ msgstr ""
 msgid "Policy"
 msgstr "策略"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:98
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 msgid "Policy assigned"
 msgstr "分配的策略"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:92
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 msgid "Protocol"
 msgstr "通信协议"
 
@@ -579,13 +579,13 @@ msgstr ""
 msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
 msgstr "单位为秒。接受的值：1-1000000。留空则使用默认值 600 秒"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:68
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 msgid "Source address"
 msgstr "源地址"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 msgid "Source port"
 msgstr "源端口"
 
@@ -652,13 +652,13 @@ msgstr ""
 msgid "Tracking hostname or IP address"
 msgstr "跟踪的主机或 IP 地址"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 msgid "Tracking method"
 msgstr "跟踪方式"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 msgid "Tracking reliability"
 msgstr "跟踪可靠性"
 
@@ -721,8 +721,8 @@ msgstr "警告：规则 %s 有一个端口配置没有指定或协议不正确�
 msgid "Waiting for command to complete..."
 msgstr "正在等待命令完成…"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 msgid "Weight"
 msgstr "比重"
 
@@ -740,14 +740,14 @@ msgstr "是"
 msgid "always"
 msgstr "总是"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:79
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:60
 msgid "blackhole (drop)"
 msgstr "黑洞（丢弃）"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:81
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:61
 msgid "default (use main routing table)"
 msgstr "默认（使用主路由表）"
@@ -764,8 +764,8 @@ msgstr "ifup"
 msgid "never"
 msgstr "从不"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:83
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
 msgid "unreachable (reject)"
 msgstr "不可达（拒绝）"
diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
index c6726ea10..1f274fd7b 100644
--- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
@@ -118,13 +118,13 @@ msgstr "檢查路由表"
 msgid "Collecting data..."
 msgstr "正在收集資料…"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:80
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:23
 msgid "Destination address"
 msgstr "目標位址"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:86
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:27
 msgid "Destination port"
 msgstr "目標埠"
 
@@ -151,8 +151,8 @@ msgid ""
 "Downed interface will be deemed up after this many successful ping tests"
 msgstr "當 Ping 成功次數達到這個數值後，已經被認為離線的介面將會重新上線"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:158
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:16
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -223,8 +223,8 @@ msgid "Initial state"
 msgstr "初始狀態"
 
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:148
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:26
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:10
 #: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:62
@@ -233,13 +233,13 @@ msgstr "初始狀態"
 msgid "Interface"
 msgstr "介面"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:206
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:191
 msgid "Interface down"
 msgstr "介面離線"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:217
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:205
 msgid "Interface up"
 msgstr "介面在線"
 
@@ -263,8 +263,8 @@ msgstr "保持故障檢測間隔"
 msgid "Keep ping failure interval during failure state"
 msgstr "在故障狀態期間保持的 Ping 故障檢測間隔"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:23
 msgid "Last resort"
 msgstr "備用成員"
 
@@ -397,10 +397,10 @@ msgstr ""
 msgid "Members assigned"
 msgstr "分配的成員"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:228
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:227
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:32
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:23
 msgid "Metric"
 msgstr "躍點數"
 
@@ -468,8 +468,8 @@ msgstr "Ping 計數"
 msgid "Ping default gateway"
 msgstr "Ping 預設閘道器"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:190
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:140
 msgid "Ping interval"
 msgstr "Ping 間隔"
 
@@ -517,13 +517,13 @@ msgstr ""
 msgid "Policy"
 msgstr "策略"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:98
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:53
 msgid "Policy assigned"
 msgstr "分配的策略"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:92
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:30
 msgid "Protocol"
 msgstr "通訊協議"
 
@@ -579,13 +579,13 @@ msgstr ""
 msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
 msgstr "單位為秒。接受的值：1-1000000。留空則使用預設值 600 秒"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:68
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:16
 msgid "Source address"
 msgstr "源位址"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:74
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:20
 msgid "Source port"
 msgstr "源埠"
 
@@ -652,13 +652,13 @@ msgstr ""
 msgid "Tracking hostname or IP address"
 msgstr "跟蹤的主機或 IP 位址"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:168
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:34
 msgid "Tracking method"
 msgstr "跟蹤方式"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:179
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:40
 msgid "Tracking reliability"
 msgstr "跟蹤可靠性"
 
@@ -721,8 +721,8 @@ msgstr "警告：規則 %s 有一個埠配置沒有指定或協議不正確！"
 msgid "Waiting for command to complete..."
 msgstr "正在等待指令完成…"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua:38
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua:27
 msgid "Weight"
 msgstr "比重"
 
@@ -740,14 +740,14 @@ msgstr "是"
 msgid "always"
 msgstr "總是"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:79
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:27
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:60
 msgid "blackhole (drop)"
 msgstr "黑洞（丟棄）"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:81
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:61
 msgid "default (use main routing table)"
 msgstr "預設（使用主路由表）"
@@ -764,8 +764,8 @@ msgstr "ifup"
 msgid "never"
 msgstr "從不"
 
-#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:83
+#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:26
 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
 msgid "unreachable (reject)"
 msgstr "不可達（拒絕）"
diff --git a/applications/luci-app-nlbwmon/po/ja/nlbwmon.po b/applications/luci-app-nlbwmon/po/ja/nlbwmon.po
index 94ddba5f3..c089d117c 100644
--- a/applications/luci-app-nlbwmon/po/ja/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ja/nlbwmon.po
@@ -11,23 +11,23 @@ msgstr ""
 "Language: ja\n"
 "X-Generator: Poedit 2.0.6\n"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:836
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:659
 msgid "%d IPv4-only hosts"
 msgstr "%d IPv4 限定ホスト"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:843
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:666
 msgid "%d IPv6-only hosts"
 msgstr "%d IPv6 限定ホスト"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:850
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:673
 msgid "%d dual-stack hosts"
 msgstr "%d デュアルスタック ホスト"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:270
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:71
 msgid "%s and %s"
 msgstr "%s, %s"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:268
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:69
 msgid "%s, %s and %s"
 msgstr "%s, %s, %s"
 
@@ -67,51 +67,51 @@ msgstr "5m - conntrack カウンターの頻繁なクリアを防ぐ、低頻度
 msgid "60s - commit minutely, useful for non-flash storage"
 msgstr "60秒 - 1分毎のコミット、非フラッシュ ストレージに有用"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:935
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:40
 msgid "<big id=\"conn-total\">0</big> connections"
 msgstr "<big id=\"conn-total\">0</big> 接続数"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:932
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:37
 msgid "<big id=\"host-total\">0</big> hosts"
 msgstr "<big id=\"host-total\">0</big> ホスト数"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:995
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:114
 msgid "<big id=\"ipv6-hosts\">0%</big> IPv6 support rate among hosts"
 msgstr "<big id=\"ipv6-hosts\">0%</big> 全ホスト中の IPv6 サポート比率"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:997
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:116
 msgid "<big id=\"ipv6-rx\">0B</big> total IPv6 download"
 msgstr "<big id=\"ipv6-rx\">0B</big> IPv6 総ダウンロード"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:996
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:115
 msgid "<big id=\"ipv6-share\">0%</big> of the total traffic is IPv6"
 msgstr "<big id=\"ipv6-share\">0%</big> 全トラフィック中の IPv6 の割合"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:998
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:117
 msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
 msgstr "<big id=\"ipv6-tx\">0B</big> IPv6 総アップロード"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:967
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:79
 msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
 msgstr "<big id=\"layer7-most-conn\">0</big> 接続数上位"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:965
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:77
 msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
 msgstr "<big id=\"layer7-most-rx\">0</big> ダウンロード上位"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:966
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:78
 msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
 msgstr "<big id=\"layer7-most-tx\">0</big> アップロード上位"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:964
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:76
 msgid "<big id=\"layer7-total\">0</big> different application protocols"
 msgstr "<big id=\"layer7-total\">0</big> アプリケーション プロトコル数"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:933
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:38
 msgid "<big id=\"rx-total\">0</big> download"
 msgstr "<big id=\"rx-total\">0</big> ダウンロード"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:934
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:39
 msgid "<big id=\"tx-total\">0</big> upload"
 msgstr "<big id=\"tx-total\">0</big> アップロード"
 
@@ -123,11 +123,11 @@ msgstr "収集期間"
 msgid "Advanced Settings"
 msgstr "拡張設定"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:973
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:85
 msgid "Application"
 msgstr "アプリケーション"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:913
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:62
 msgid "Application Protocols"
 msgstr "アプリケーション プロトコル"
 
@@ -139,15 +139,15 @@ msgstr "バックアップ"
 msgid "Bandwidth Monitor"
 msgstr "帯域幅モニター"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1016
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:142
 msgid "CSV, grouped by IP"
 msgstr "CSV（IP によるグループ化）"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1015
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:141
 msgid "CSV, grouped by MAC"
 msgstr "CSV（MAC によるグループ化）"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1017
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:143
 msgid "CSV, grouped by protocol"
 msgstr "CSV（プロトコルによるグループ化）"
 
@@ -169,6 +169,12 @@ msgstr ""
 "毎月3日）。設定した日数毎にデータの収集を行うには、\"特定の間隔\" を選択しま"
 "す。後者の場合、指定された日付から開始されます。"
 
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:56
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:94
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:133
+msgid "Collecting data..."
+msgstr ""
+
 #: applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua:177
 msgid "Commit interval"
 msgstr "コミット間隔"
@@ -181,16 +187,16 @@ msgstr "データベースの圧縮"
 msgid "Configuration"
 msgstr "設定"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:489
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:300
 msgid "Conn."
 msgstr "接続数"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:943
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:974
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:48
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:86
 msgid "Connections"
 msgstr "接続数"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:926
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:31
 msgid "Connections / Host"
 msgstr "ホスト毎の接続数"
 
@@ -223,17 +229,31 @@ msgstr ""
 msgid "Display"
 msgstr "表示"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:490
-msgid "Down. (Bytes / Pkts.)"
-msgstr "ダウンロード（Bytes / Pkts.）"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:301
+msgid "Down. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:302
+msgid "Down. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:283
+msgid "Download"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:49
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:87
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:126
+msgid "Download (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:944
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:975
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1007
-msgid "Download (Bytes / Packets)"
-msgstr "ダウンロード（Bytes / Packets）"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:50
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:88
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:127
+msgid "Download (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:953
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:65
 msgid "Download / Application"
 msgstr "ダウンロード / アプリケーション"
 
@@ -241,7 +261,7 @@ msgstr "ダウンロード / アプリケーション"
 msgid "Download Database Backup"
 msgstr "データベース バックアップのダウンロード"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:989
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:108
 msgid "Dualstack enabled hosts"
 msgstr "デュアルスタック ホスト"
 
@@ -249,11 +269,11 @@ msgstr "デュアルスタック ホスト"
 msgid "Due date"
 msgstr "期日"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:915
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:139
 msgid "Export"
 msgstr "エクスポート"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1006
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:125
 msgid "Family"
 msgstr "IP 種別"
 
@@ -261,9 +281,9 @@ msgstr "IP 種別"
 msgid "Fixed interval"
 msgstr "特定の間隔"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:474
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:532
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:637
 msgid "Force reload…"
 msgstr "強制リロード..."
 
@@ -275,20 +295,25 @@ msgstr "全般設定"
 msgid "Generate Backup"
 msgstr "バックアップの作成"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:941
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1004
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:46
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:123
 msgid "Host"
 msgstr "ホスト"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:893
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:292
 msgid "Hostname: <big id=\"bubble-hostname\">example.org</big>"
 msgstr "ホスト名: <big id=\"bubble-hostname\">example.org</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:984
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:622
+msgid "IPv4"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:103
 msgid "IPv4 vs. IPv6"
 msgstr "IPv4 及び IPv6"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:914
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:623
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:100
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -316,7 +341,7 @@ msgstr ""
 msgid "Invalid or empty backup archive"
 msgstr "無効または空のバックアップ アーカイブです。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1018
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:144
 msgid "JSON dump"
 msgstr "JSON ダンプ"
 
@@ -332,8 +357,8 @@ msgstr "ローカル インターフェース"
 msgid "Local subnets"
 msgstr "ローカル サブネット"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:942
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1005
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:47
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:124
 msgid "MAC"
 msgstr "MAC"
 
@@ -349,7 +374,7 @@ msgstr ""
 "計測データを保持する、収集期間の最大個数です。 '0' を設定した場合、全データを"
 "保持します。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:876
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:13
 msgid "Netlink Bandwidth Monitor"
 msgstr "Netlink Bandwidth Monitor"
 
@@ -361,9 +386,9 @@ msgstr "Netlink Bandwidth Monitor - バックアップ / 復元"
 msgid "Netlink Bandwidth Monitor - Configuration"
 msgstr "Netlink Bandwidth Monitor - 設定"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:473
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:531
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:636
 msgid "No data recorded yet."
 msgstr "まだデータがありません。"
 
@@ -380,7 +405,7 @@ msgstr "設定されたサブネットにおける conntrack ストリームの�
 msgid "Preallocate database"
 msgstr "データベースの事前割当"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:604
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:449
 msgid "Protocol"
 msgstr "プロトコル"
 
@@ -411,11 +436,11 @@ msgstr "復元"
 msgid "Restore Database Backup"
 msgstr "データベースの復元"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:905
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:16
 msgid "Select accounting period:"
 msgstr "収集期間を選択:"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:597
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:444
 msgid "Source IP"
 msgstr "アクセス元 IP"
 
@@ -451,29 +476,43 @@ msgstr ""
 "データベースに保管される最大件数です。 '0' を設定した場合、制限無しのデータ"
 "ベースの増大を許可します。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:921
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:26
 msgid "Traffic / Host"
 msgstr "ホスト毎のトラフィック"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:912
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:23
 msgid "Traffic Distribution"
 msgstr "トラフィック内訳"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:491
-msgid "Up. (Bytes / Pkts.)"
-msgstr "アップロード（Bytes / Pkts.）"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:303
+msgid "Up. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:304
+msgid "Up. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:287
+msgid "Upload"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:51
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:89
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:128
+msgid "Upload (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:945
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:976
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1008
-msgid "Upload (Bytes / Packets)"
-msgstr "アップロード（Bytes / Packets）"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:52
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:90
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:129
+msgid "Upload (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:958
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:70
 msgid "Upload / Application"
 msgstr "アップロード / アプリケーション"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:894
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:293
 msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
 msgstr "ベンダ: <big id=\"bubble-vendor\">Example Corp.</big>"
 
@@ -498,16 +537,28 @@ msgid ""
 "satisfy memory allocation after longer uptime periods."
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:285
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:88
 msgid "no traffic"
 msgstr "トラフィック無し"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:498
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:506
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:511
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:598
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:670
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:675
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:678
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:313
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:325
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:330
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:445
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:502
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:515
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:520
 msgid "other"
 msgstr "その他"
+
+#~ msgid "Down. (Bytes / Pkts.)"
+#~ msgstr "ダウンロード（Bytes / Pkts.）"
+
+#~ msgid "Download (Bytes / Packets)"
+#~ msgstr "ダウンロード（Bytes / Packets）"
+
+#~ msgid "Up. (Bytes / Pkts.)"
+#~ msgstr "アップロード（Bytes / Pkts.）"
+
+#~ msgid "Upload (Bytes / Packets)"
+#~ msgstr "アップロード（Bytes / Packets）"
diff --git a/applications/luci-app-nlbwmon/po/ru/nlbwmon.po b/applications/luci-app-nlbwmon/po/ru/nlbwmon.po
index e498b71e3..fa01348bb 100644
--- a/applications/luci-app-nlbwmon/po/ru/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/ru/nlbwmon.po
@@ -15,23 +15,23 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:836
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:659
 msgid "%d IPv4-only hosts"
 msgstr "%d только IPv4 хост(а)"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:843
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:666
 msgid "%d IPv6-only hosts"
 msgstr "%d только IPv6 хост(а)"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:850
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:673
 msgid "%d dual-stack hosts"
 msgstr "%d хост(а) с двумя стеками"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:270
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:71
 msgid "%s and %s"
 msgstr "%s и %s"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:268
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:69
 msgid "%s, %s and %s"
 msgstr "%s, %s и %s"
 
@@ -76,51 +76,51 @@ msgstr ""
 msgid "60s - commit minutely, useful for non-flash storage"
 msgstr "60s - поминутное сохранение, флеш память не используется."
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:935
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:40
 msgid "<big id=\"conn-total\">0</big> connections"
 msgstr "<big id=\"conn-total\">0</big> соединений"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:932
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:37
 msgid "<big id=\"host-total\">0</big> hosts"
 msgstr "<big id=\"host-total\">0</big> хост(а)"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:995
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:114
 msgid "<big id=\"ipv6-hosts\">0%</big> IPv6 support rate among hosts"
 msgstr "<big id=\"ipv6-hosts\">0%</big> IPv6 скорость поддержки среди хостов"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:997
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:116
 msgid "<big id=\"ipv6-rx\">0B</big> total IPv6 download"
 msgstr "<big id=\"ipv6-rx\">0B</big> всего IPv6 получено"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:996
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:115
 msgid "<big id=\"ipv6-share\">0%</big> of the total traffic is IPv6"
 msgstr "<big id=\"ipv6-share\">0%</big> общий трафик IPv6"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:998
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:117
 msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
 msgstr "<big id=\"ipv6-tx\">0B</big> всего IPv6 отправлено"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:967
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:79
 msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
 msgstr "<big id=\"layer7-most-conn\">0</big> максимальное кол-во соединений"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:965
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:77
 msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
 msgstr "<big id=\"layer7-most-rx\">0</big> максимальное получение (RX)"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:966
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:78
 msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
 msgstr "<big id=\"layer7-most-tx\">0</big> максимальная передача (TX)"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:964
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:76
 msgid "<big id=\"layer7-total\">0</big> different application protocols"
 msgstr "<big id=\"layer7-total\">0</big> различное применение протоколов"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:933
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:38
 msgid "<big id=\"rx-total\">0</big> download"
 msgstr "<big id=\"rx-total\">0</big> получение (RX)"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:934
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:39
 msgid "<big id=\"tx-total\">0</big> upload"
 msgstr "<big id=\"tx-total\">0</big> передача (TX)"
 
@@ -132,11 +132,11 @@ msgstr "Отчетный период"
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:973
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:85
 msgid "Application"
 msgstr "Применение"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:913
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:62
 msgid "Application Protocols"
 msgstr "Применение протоколов"
 
@@ -148,15 +148,15 @@ msgstr "Резервная копия"
 msgid "Bandwidth Monitor"
 msgstr "Трафик"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1016
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:142
 msgid "CSV, grouped by IP"
 msgstr "CSV, сгруппированный по IP-адресу"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1015
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:141
 msgid "CSV, grouped by MAC"
 msgstr "CSV, сгруппированный по MAC-у"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1017
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:143
 msgid "CSV, grouped by protocol"
 msgstr "CSV, сгруппированный по протоколу"
 
@@ -179,6 +179,12 @@ msgstr ""
 "'Фиксированный интервал', чтобы перезапустить отчетный период через каждые N "
 "дней, начиная с заданной даты."
 
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:56
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:94
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:133
+msgid "Collecting data..."
+msgstr ""
+
 #: applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua:177
 msgid "Commit interval"
 msgstr "Интервал сохранения"
@@ -191,16 +197,16 @@ msgstr "Сжатие базы данных"
 msgid "Configuration"
 msgstr "Настройка config файла"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:489
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:300
 msgid "Conn."
 msgstr "Соед."
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:943
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:974
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:48
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:86
 msgid "Connections"
 msgstr "Соединения"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:926
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:31
 msgid "Connections / Host"
 msgstr "Соединения / Хост"
 
@@ -234,17 +240,31 @@ msgstr ""
 msgid "Display"
 msgstr "Показать состояние"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:490
-msgid "Down. (Bytes / Pkts.)"
-msgstr "Внутр. (Bytes / Pkts.)"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:301
+msgid "Down. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:302
+msgid "Down. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:283
+msgid "Download"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:49
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:87
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:126
+msgid "Download (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:944
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:975
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1007
-msgid "Download (Bytes / Packets)"
-msgstr "Получение (Байты / Пакеты)"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:50
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:88
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:127
+msgid "Download (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:953
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:65
 msgid "Download / Application"
 msgstr "Получение / Применение"
 
@@ -252,7 +272,7 @@ msgstr "Получение / Применение"
 msgid "Download Database Backup"
 msgstr "Загрузка резервной копии базы данных"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:989
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:108
 msgid "Dualstack enabled hosts"
 msgstr "Dualstack включенный хост(а)"
 
@@ -260,11 +280,11 @@ msgstr "Dualstack включенный хост(а)"
 msgid "Due date"
 msgstr "Дата перезапуска"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:915
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:139
 msgid "Export"
 msgstr "Сохранить статистику"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1006
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:125
 msgid "Family"
 msgstr "Семейство протоколов"
 
@@ -272,9 +292,9 @@ msgstr "Семейство протоколов"
 msgid "Fixed interval"
 msgstr "Фиксированный интервал"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:474
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:532
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:637
 msgid "Force reload…"
 msgstr "Принудительная перезагрузка..."
 
@@ -286,20 +306,25 @@ msgstr "Основные настройки"
 msgid "Generate Backup"
 msgstr "Создать резервную копию"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:941
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1004
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:46
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:123
 msgid "Host"
 msgstr "Хост"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:893
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:292
 msgid "Hostname: <big id=\"bubble-hostname\">example.org</big>"
 msgstr "Имя хоста: <big id=\"bubble-hostname\">пример.org</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:984
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:622
+msgid "IPv4"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:103
 msgid "IPv4 vs. IPv6"
 msgstr "IPv4 против IPv6"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:914
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:623
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:100
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -327,7 +352,7 @@ msgstr ""
 msgid "Invalid or empty backup archive"
 msgstr "Недопустимый или пустой архив резервной копии"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1018
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:144
 msgid "JSON dump"
 msgstr "Дамп JSON"
 
@@ -343,8 +368,8 @@ msgstr "Локальные интерфейсы"
 msgid "Local subnets"
 msgstr "Локальные подсети"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:942
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1005
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:47
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:124
 msgid "MAC"
 msgstr "MAC-адрес"
 
@@ -360,7 +385,7 @@ msgstr ""
 "Максимальное количество отчетных периодов для хранения.<br />Установив "
 "значение '0', вы сохраните баз данных навсегда."
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:876
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:13
 msgid "Netlink Bandwidth Monitor"
 msgstr "Мониторинг трафика сети"
 
@@ -372,9 +397,9 @@ msgstr "Мониторинг трафика сети - Резервная коп
 msgid "Netlink Bandwidth Monitor - Configuration"
 msgstr "Мониторинг трафика сети - Настройка"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:473
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:531
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:636
 msgid "No data recorded yet."
 msgstr "Данные еще не записаны."
 
@@ -390,7 +415,7 @@ msgstr "Отслеживаются только соединения из или
 msgid "Preallocate database"
 msgstr "Максимальный размер базы данных"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:604
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:449
 msgid "Protocol"
 msgstr "Протокол"
 
@@ -420,11 +445,11 @@ msgstr "Восстановить"
 msgid "Restore Database Backup"
 msgstr "Восстановление резервной копии базы данных"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:905
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:16
 msgid "Select accounting period:"
 msgstr "Выберите отчетный период:"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:597
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:444
 msgid "Source IP"
 msgstr "IP-адрес источника"
 
@@ -463,29 +488,43 @@ msgstr ""
 "Максимальное количество записей, которые должны быть помещены в базу данных."
 "<br />Значение '0' позволит базам данных расти бесконечно."
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:921
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:26
 msgid "Traffic / Host"
 msgstr "Трафик / Хост"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:912
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:23
 msgid "Traffic Distribution"
 msgstr "Распределение трафика"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:491
-msgid "Up. (Bytes / Pkts.)"
-msgstr "Внешн. (Bytes / Pkts.)"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:303
+msgid "Up. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:304
+msgid "Up. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:287
+msgid "Upload"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:51
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:89
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:128
+msgid "Upload (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:945
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:976
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1008
-msgid "Upload (Bytes / Packets)"
-msgstr "Передача (Байты / Пакеты)"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:52
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:90
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:129
+msgid "Upload (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:958
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:70
 msgid "Upload / Application"
 msgstr "Передача / Применение"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:894
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:293
 msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
 msgstr "Производитель: <big id=\"bubble-vendor\">Например Corp.</big>"
 
@@ -513,16 +552,28 @@ msgstr ""
 "состоянии выделить необходимый объем памяти после долгой бесперебойной "
 "работы."
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:285
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:88
 msgid "no traffic"
 msgstr "нет трафика"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:498
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:506
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:511
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:598
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:670
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:675
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:678
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:313
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:325
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:330
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:445
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:502
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:515
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:520
 msgid "other"
 msgstr "другие"
+
+#~ msgid "Down. (Bytes / Pkts.)"
+#~ msgstr "Внутр. (Bytes / Pkts.)"
+
+#~ msgid "Download (Bytes / Packets)"
+#~ msgstr "Получение (Байты / Пакеты)"
+
+#~ msgid "Up. (Bytes / Pkts.)"
+#~ msgstr "Внешн. (Bytes / Pkts.)"
+
+#~ msgid "Upload (Bytes / Packets)"
+#~ msgstr "Передача (Байты / Пакеты)"
diff --git a/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot b/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot
index 9f23a4ce5..8f428c98d 100644
--- a/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot
+++ b/applications/luci-app-nlbwmon/po/templates/nlbwmon.pot
@@ -1,23 +1,23 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:836
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:659
 msgid "%d IPv4-only hosts"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:843
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:666
 msgid "%d IPv6-only hosts"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:850
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:673
 msgid "%d dual-stack hosts"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:270
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:71
 msgid "%s and %s"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:268
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:69
 msgid "%s, %s and %s"
 msgstr ""
 
@@ -57,51 +57,51 @@ msgstr ""
 msgid "60s - commit minutely, useful for non-flash storage"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:935
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:40
 msgid "<big id=\"conn-total\">0</big> connections"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:932
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:37
 msgid "<big id=\"host-total\">0</big> hosts"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:995
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:114
 msgid "<big id=\"ipv6-hosts\">0%</big> IPv6 support rate among hosts"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:997
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:116
 msgid "<big id=\"ipv6-rx\">0B</big> total IPv6 download"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:996
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:115
 msgid "<big id=\"ipv6-share\">0%</big> of the total traffic is IPv6"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:998
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:117
 msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:967
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:79
 msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:965
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:77
 msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:966
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:78
 msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:964
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:76
 msgid "<big id=\"layer7-total\">0</big> different application protocols"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:933
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:38
 msgid "<big id=\"rx-total\">0</big> download"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:934
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:39
 msgid "<big id=\"tx-total\">0</big> upload"
 msgstr ""
 
@@ -113,11 +113,11 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:973
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:85
 msgid "Application"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:913
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:62
 msgid "Application Protocols"
 msgstr ""
 
@@ -129,15 +129,15 @@ msgstr ""
 msgid "Bandwidth Monitor"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1016
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:142
 msgid "CSV, grouped by IP"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1015
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:141
 msgid "CSV, grouped by MAC"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1017
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:143
 msgid "CSV, grouped by protocol"
 msgstr ""
 
@@ -154,6 +154,12 @@ msgid ""
 "accounting period exactly every N days, beginning at a given date."
 msgstr ""
 
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:56
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:94
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:133
+msgid "Collecting data..."
+msgstr ""
+
 #: applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua:177
 msgid "Commit interval"
 msgstr ""
@@ -166,16 +172,16 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:489
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:300
 msgid "Conn."
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:943
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:974
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:48
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:86
 msgid "Connections"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:926
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:31
 msgid "Connections / Host"
 msgstr ""
 
@@ -204,17 +210,31 @@ msgstr ""
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:490
-msgid "Down. (Bytes / Pkts.)"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:301
+msgid "Down. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:302
+msgid "Down. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:283
+msgid "Download"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:49
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:87
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:126
+msgid "Download (Bytes)"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:944
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:975
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1007
-msgid "Download (Bytes / Packets)"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:50
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:88
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:127
+msgid "Download (Packets)"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:953
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:65
 msgid "Download / Application"
 msgstr ""
 
@@ -222,7 +242,7 @@ msgstr ""
 msgid "Download Database Backup"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:989
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:108
 msgid "Dualstack enabled hosts"
 msgstr ""
 
@@ -230,11 +250,11 @@ msgstr ""
 msgid "Due date"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:915
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:139
 msgid "Export"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1006
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:125
 msgid "Family"
 msgstr ""
 
@@ -242,9 +262,9 @@ msgstr ""
 msgid "Fixed interval"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:474
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:532
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:637
 msgid "Force reload…"
 msgstr ""
 
@@ -256,20 +276,25 @@ msgstr ""
 msgid "Generate Backup"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:941
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1004
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:46
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:123
 msgid "Host"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:893
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:292
 msgid "Hostname: <big id=\"bubble-hostname\">example.org</big>"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:984
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:622
+msgid "IPv4"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:103
 msgid "IPv4 vs. IPv6"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:914
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:623
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:100
 msgid "IPv6"
 msgstr ""
 
@@ -293,7 +318,7 @@ msgstr ""
 msgid "Invalid or empty backup archive"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1018
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:144
 msgid "JSON dump"
 msgstr ""
 
@@ -309,8 +334,8 @@ msgstr ""
 msgid "Local subnets"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:942
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1005
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:47
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:124
 msgid "MAC"
 msgstr ""
 
@@ -324,7 +349,7 @@ msgid ""
 "forever."
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:876
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:13
 msgid "Netlink Bandwidth Monitor"
 msgstr ""
 
@@ -336,9 +361,9 @@ msgstr ""
 msgid "Netlink Bandwidth Monitor - Configuration"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:473
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:531
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:636
 msgid "No data recorded yet."
 msgstr ""
 
@@ -354,7 +379,7 @@ msgstr ""
 msgid "Preallocate database"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:604
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:449
 msgid "Protocol"
 msgstr ""
 
@@ -381,11 +406,11 @@ msgstr ""
 msgid "Restore Database Backup"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:905
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:16
 msgid "Select accounting period:"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:597
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:444
 msgid "Source IP"
 msgstr ""
 
@@ -417,29 +442,43 @@ msgid ""
 "the limit to 0 will allow databases to grow indefinitely."
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:921
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:26
 msgid "Traffic / Host"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:912
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:23
 msgid "Traffic Distribution"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:491
-msgid "Up. (Bytes / Pkts.)"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:303
+msgid "Up. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:304
+msgid "Up. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:287
+msgid "Upload"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:51
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:89
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:128
+msgid "Upload (Bytes)"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:945
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:976
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1008
-msgid "Upload (Bytes / Packets)"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:52
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:90
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:129
+msgid "Upload (Packets)"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:958
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:70
 msgid "Upload / Application"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:894
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:293
 msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
 msgstr ""
 
@@ -461,16 +500,16 @@ msgid ""
 "satisfy memory allocation after longer uptime periods."
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:285
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:88
 msgid "no traffic"
 msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:498
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:506
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:511
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:598
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:670
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:675
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:678
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:313
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:325
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:330
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:445
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:502
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:515
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:520
 msgid "other"
 msgstr ""
diff --git a/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
index 53f1bf573..0fd7ebce0 100644
--- a/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
@@ -11,23 +11,23 @@ msgstr ""
 "PO-Revision-Date: 2018-08-07 19:48+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:836
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:659
 msgid "%d IPv4-only hosts"
 msgstr "%d 台仅 IPv4 主机"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:843
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:666
 msgid "%d IPv6-only hosts"
 msgstr "%d 台仅 IPv6 主机"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:850
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:673
 msgid "%d dual-stack hosts"
 msgstr "%d 台双协议栈主机"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:270
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:71
 msgid "%s and %s"
 msgstr "%s 和 %s"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:268
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:69
 msgid "%s, %s and %s"
 msgstr "%s，%s 和 %s"
 
@@ -67,51 +67,51 @@ msgstr "5m - 较少刷新以避免频繁清除连接跟踪计数器"
 msgid "60s - commit minutely, useful for non-flash storage"
 msgstr "60s - 每分钟提交，适用于非闪存类型存储"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:935
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:40
 msgid "<big id=\"conn-total\">0</big> connections"
 msgstr "连接：<big id=\"conn-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:932
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:37
 msgid "<big id=\"host-total\">0</big> hosts"
 msgstr "主机：<big id=\"host-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:995
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:114
 msgid "<big id=\"ipv6-hosts\">0%</big> IPv6 support rate among hosts"
 msgstr "支持 IPv6 的主机比例：<big id=\"ipv6-hosts\">0%</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:997
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:116
 msgid "<big id=\"ipv6-rx\">0B</big> total IPv6 download"
 msgstr "IPv6 总下载量：<big id=\"ipv6-rx\">0B</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:996
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:115
 msgid "<big id=\"ipv6-share\">0%</big> of the total traffic is IPv6"
 msgstr "IPv6 流量比例：<big id=\"ipv6-share\">0%</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:998
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:117
 msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
 msgstr "IPv6 总上传量：<big id=\"ipv6-tx\">0B</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:967
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:79
 msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
 msgstr "连接数最多的协议：<big id=\"layer7-most-conn\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:965
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:77
 msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
 msgstr "下载量最大的协议：<big id=\"layer7-most-rx\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:966
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:78
 msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
 msgstr "上传量最大的协议：<big id=\"layer7-most-tx\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:964
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:76
 msgid "<big id=\"layer7-total\">0</big> different application protocols"
 msgstr "应用层协议计数：<big id=\"layer7-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:933
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:38
 msgid "<big id=\"rx-total\">0</big> download"
 msgstr "下载：<big id=\"rx-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:934
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:39
 msgid "<big id=\"tx-total\">0</big> upload"
 msgstr "上传：<big id=\"tx-total\">0</big>"
 
@@ -123,11 +123,11 @@ msgstr "统计周期"
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:973
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:85
 msgid "Application"
 msgstr "应用层"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:913
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:62
 msgid "Application Protocols"
 msgstr "应用层协议"
 
@@ -139,15 +139,15 @@ msgstr "备份"
 msgid "Bandwidth Monitor"
 msgstr "带宽监控"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1016
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:142
 msgid "CSV, grouped by IP"
 msgstr "CSV，按 IP 分组"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1015
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:141
 msgid "CSV, grouped by MAC"
 msgstr "CSV，按 MAC 分组"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1017
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:143
 msgid "CSV, grouped by protocol"
 msgstr "CSV，按协议分组"
 
@@ -168,6 +168,12 @@ msgstr ""
 "选择“每月的某一天”来设置统计周期的重启时间，例如：每个月的第 3 天。选择“固定"
 "周期”来设置从给定日期开始每 N 天重启统计周期。"
 
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:56
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:94
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:133
+msgid "Collecting data..."
+msgstr ""
+
 #: applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua:177
 msgid "Commit interval"
 msgstr "提交间隔"
@@ -180,16 +186,16 @@ msgstr "压缩数据库"
 msgid "Configuration"
 msgstr "配置"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:489
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:300
 msgid "Conn."
 msgstr "连接"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:943
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:974
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:48
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:86
 msgid "Connections"
 msgstr "连接"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:926
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:31
 msgid "Connections / Host"
 msgstr "连接 / 主机"
 
@@ -220,17 +226,31 @@ msgstr ""
 msgid "Display"
 msgstr "显示"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:490
-msgid "Down. (Bytes / Pkts.)"
-msgstr "下载（字节 / 数据包）"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:301
+msgid "Down. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:302
+msgid "Down. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:283
+msgid "Download"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:49
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:87
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:126
+msgid "Download (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:944
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:975
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1007
-msgid "Download (Bytes / Packets)"
-msgstr "下载（字节 / 数据包）"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:50
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:88
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:127
+msgid "Download (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:953
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:65
 msgid "Download / Application"
 msgstr "下载 / 应用层协议"
 
@@ -238,7 +258,7 @@ msgstr "下载 / 应用层协议"
 msgid "Download Database Backup"
 msgstr "下载数据库备份"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:989
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:108
 msgid "Dualstack enabled hosts"
 msgstr "双协议栈主机"
 
@@ -246,11 +266,11 @@ msgstr "双协议栈主机"
 msgid "Due date"
 msgstr "重置日期"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:915
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:139
 msgid "Export"
 msgstr "导出"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1006
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:125
 msgid "Family"
 msgstr "协议簇"
 
@@ -258,9 +278,9 @@ msgstr "协议簇"
 msgid "Fixed interval"
 msgstr "固定周期"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:474
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:532
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:637
 msgid "Force reload…"
 msgstr "强制重新加载…"
 
@@ -272,20 +292,25 @@ msgstr "基本设置"
 msgid "Generate Backup"
 msgstr "生成备份"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:941
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1004
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:46
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:123
 msgid "Host"
 msgstr "主机"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:893
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:292
 msgid "Hostname: <big id=\"bubble-hostname\">example.org</big>"
 msgstr "主机名：<big id=\"bubble-hostname\">example.org</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:984
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:622
+msgid "IPv4"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:103
 msgid "IPv4 vs. IPv6"
 msgstr "IPv4 与 IPv6"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:914
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:623
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:100
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -309,7 +334,7 @@ msgstr "从 netlink 信息中刷新“已建立连接”的流量计数器的间
 msgid "Invalid or empty backup archive"
 msgstr "备份存档无效或为空"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1018
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:144
 msgid "JSON dump"
 msgstr "JSON 输出"
 
@@ -325,8 +350,8 @@ msgstr "本地接口"
 msgid "Local subnets"
 msgstr "本地子网"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:942
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1005
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:47
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:124
 msgid "MAC"
 msgstr "MAC"
 
@@ -340,7 +365,7 @@ msgid ""
 "forever."
 msgstr "保留的统计周期数据库的最大数量，设置 0 表示不限制。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:876
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:13
 msgid "Netlink Bandwidth Monitor"
 msgstr "网络带宽监视器"
 
@@ -352,9 +377,9 @@ msgstr "网络带宽监视器 - 备份 / 恢复"
 msgid "Netlink Bandwidth Monitor - Configuration"
 msgstr "网络带宽监视器 - 配置"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:473
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:531
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:636
 msgid "No data recorded yet."
 msgstr "暂无数据记录。"
 
@@ -370,7 +395,7 @@ msgstr "仅统计来自或目标为这些子网的连接流量。"
 msgid "Preallocate database"
 msgstr "预分配数据库"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:604
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:449
 msgid "Protocol"
 msgstr "协议"
 
@@ -399,11 +424,11 @@ msgstr "恢复"
 msgid "Restore Database Backup"
 msgstr "恢复数据库备份"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:905
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:16
 msgid "Select accounting period:"
 msgstr "选择统计周期："
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:597
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:444
 msgid "Source IP"
 msgstr "源 IP"
 
@@ -437,29 +462,43 @@ msgid ""
 "the limit to 0 will allow databases to grow indefinitely."
 msgstr "数据库中的最大条目数量, 设置为 0 将允许数据库无限增长。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:921
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:26
 msgid "Traffic / Host"
 msgstr "流量 / 主机"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:912
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:23
 msgid "Traffic Distribution"
 msgstr "流量分布"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:491
-msgid "Up. (Bytes / Pkts.)"
-msgstr "上传（字节 / 数据包）"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:303
+msgid "Up. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:304
+msgid "Up. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:287
+msgid "Upload"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:51
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:89
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:128
+msgid "Upload (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:945
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:976
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1008
-msgid "Upload (Bytes / Packets)"
-msgstr "上传（字节 / 数据包）"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:52
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:90
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:129
+msgid "Upload (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:958
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:70
 msgid "Upload / Application"
 msgstr "上传 / 应用层协议"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:894
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:293
 msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
 msgstr "供应商：<big id=\"bubble-vendor\">Example Corp.</big>"
 
@@ -485,16 +524,28 @@ msgstr ""
 "是否预先分配数据库最大可能占用的内存大小。这主要适用于内存较小系统，这些系统"
 "在长时间运行之后可能无法满足数据库的内存需求。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:285
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:88
 msgid "no traffic"
 msgstr "无流量数据"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:498
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:506
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:511
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:598
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:670
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:675
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:678
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:313
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:325
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:330
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:445
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:502
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:515
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:520
 msgid "other"
 msgstr "其他"
+
+#~ msgid "Down. (Bytes / Pkts.)"
+#~ msgstr "下载（字节 / 数据包）"
+
+#~ msgid "Download (Bytes / Packets)"
+#~ msgstr "下载（字节 / 数据包）"
+
+#~ msgid "Up. (Bytes / Pkts.)"
+#~ msgstr "上传（字节 / 数据包）"
+
+#~ msgid "Upload (Bytes / Packets)"
+#~ msgstr "上传（字节 / 数据包）"
diff --git a/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
index f31c8dd76..5a2633438 100644
--- a/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
@@ -11,23 +11,23 @@ msgstr ""
 "PO-Revision-Date: 2018-08-07 19:48+0800\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:836
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:659
 msgid "%d IPv4-only hosts"
 msgstr "%d 臺僅 IPv4 主機"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:843
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:666
 msgid "%d IPv6-only hosts"
 msgstr "%d 臺僅 IPv6 主機"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:850
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:673
 msgid "%d dual-stack hosts"
 msgstr "%d 臺雙協議棧主機"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:270
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:71
 msgid "%s and %s"
 msgstr "%s 和 %s"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:268
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:69
 msgid "%s, %s and %s"
 msgstr "%s，%s 和 %s"
 
@@ -67,51 +67,51 @@ msgstr "5m - 較少重新整理以避免頻繁清除連線跟蹤計數器"
 msgid "60s - commit minutely, useful for non-flash storage"
 msgstr "60s - 每分鐘提交，適用於非快閃記憶體型別儲存"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:935
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:40
 msgid "<big id=\"conn-total\">0</big> connections"
 msgstr "連線：<big id=\"conn-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:932
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:37
 msgid "<big id=\"host-total\">0</big> hosts"
 msgstr "主機：<big id=\"host-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:995
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:114
 msgid "<big id=\"ipv6-hosts\">0%</big> IPv6 support rate among hosts"
 msgstr "支援 IPv6 的主機比例：<big id=\"ipv6-hosts\">0%</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:997
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:116
 msgid "<big id=\"ipv6-rx\">0B</big> total IPv6 download"
 msgstr "IPv6 總下載量：<big id=\"ipv6-rx\">0B</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:996
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:115
 msgid "<big id=\"ipv6-share\">0%</big> of the total traffic is IPv6"
 msgstr "IPv6 流量比例：<big id=\"ipv6-share\">0%</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:998
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:117
 msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
 msgstr "IPv6 總上傳量：<big id=\"ipv6-tx\">0B</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:967
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:79
 msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
 msgstr "連線數最多的協議：<big id=\"layer7-most-conn\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:965
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:77
 msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
 msgstr "下載量最大的協議：<big id=\"layer7-most-rx\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:966
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:78
 msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
 msgstr "上傳量最大的協議：<big id=\"layer7-most-tx\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:964
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:76
 msgid "<big id=\"layer7-total\">0</big> different application protocols"
 msgstr "應用層協議計數：<big id=\"layer7-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:933
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:38
 msgid "<big id=\"rx-total\">0</big> download"
 msgstr "下載：<big id=\"rx-total\">0</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:934
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:39
 msgid "<big id=\"tx-total\">0</big> upload"
 msgstr "上傳：<big id=\"tx-total\">0</big>"
 
@@ -123,11 +123,11 @@ msgstr "統計週期"
 msgid "Advanced Settings"
 msgstr "高階設定"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:973
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:85
 msgid "Application"
 msgstr "應用層"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:913
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:62
 msgid "Application Protocols"
 msgstr "應用層協議"
 
@@ -139,15 +139,15 @@ msgstr "備份"
 msgid "Bandwidth Monitor"
 msgstr "頻寬監控"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1016
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:142
 msgid "CSV, grouped by IP"
 msgstr "CSV，按 IP 分組"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1015
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:141
 msgid "CSV, grouped by MAC"
 msgstr "CSV，按 MAC 分組"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1017
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:143
 msgid "CSV, grouped by protocol"
 msgstr "CSV，按協議分組"
 
@@ -168,6 +168,12 @@ msgstr ""
 "選擇“每月的某一天”來設定統計週期的重啟時間，例如：每個月的第 3 天。選擇“固定"
 "週期”來設定從給定日期開始每 N 天重啟統計週期。"
 
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:56
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:94
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:133
+msgid "Collecting data..."
+msgstr ""
+
 #: applications/luci-app-nlbwmon/luasrc/model/cbi/nlbw/config.lua:177
 msgid "Commit interval"
 msgstr "提交間隔"
@@ -180,16 +186,16 @@ msgstr "壓縮資料庫"
 msgid "Configuration"
 msgstr "配置"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:489
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:300
 msgid "Conn."
 msgstr "連線"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:943
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:974
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:48
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:86
 msgid "Connections"
 msgstr "連線"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:926
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:31
 msgid "Connections / Host"
 msgstr "連線 / 主機"
 
@@ -220,17 +226,31 @@ msgstr ""
 msgid "Display"
 msgstr "顯示"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:490
-msgid "Down. (Bytes / Pkts.)"
-msgstr "下載（位元組 / 資料包）"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:301
+msgid "Down. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:302
+msgid "Down. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:283
+msgid "Download"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:49
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:87
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:126
+msgid "Download (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:944
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:975
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1007
-msgid "Download (Bytes / Packets)"
-msgstr "下載（位元組 / 資料包）"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:50
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:88
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:127
+msgid "Download (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:953
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:65
 msgid "Download / Application"
 msgstr "下載 / 應用層協議"
 
@@ -238,7 +258,7 @@ msgstr "下載 / 應用層協議"
 msgid "Download Database Backup"
 msgstr "下載資料庫備份"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:989
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:108
 msgid "Dualstack enabled hosts"
 msgstr "雙協議棧主機"
 
@@ -246,11 +266,11 @@ msgstr "雙協議棧主機"
 msgid "Due date"
 msgstr "重置日期"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:915
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:139
 msgid "Export"
 msgstr "匯出"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1006
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:125
 msgid "Family"
 msgstr "協議簇"
 
@@ -258,9 +278,9 @@ msgstr "協議簇"
 msgid "Fixed interval"
 msgstr "固定週期"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:474
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:532
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:637
 msgid "Force reload…"
 msgstr "強制重新載入…"
 
@@ -272,20 +292,25 @@ msgstr "基本設定"
 msgid "Generate Backup"
 msgstr "生成備份"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:941
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1004
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:46
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:123
 msgid "Host"
 msgstr "主機"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:893
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:292
 msgid "Hostname: <big id=\"bubble-hostname\">example.org</big>"
 msgstr "主機名：<big id=\"bubble-hostname\">example.org</big>"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:984
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:622
+msgid "IPv4"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:103
 msgid "IPv4 vs. IPv6"
 msgstr "IPv4 與 IPv6"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:914
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:623
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:100
 msgid "IPv6"
 msgstr "IPv6"
 
@@ -309,7 +334,7 @@ msgstr "從 netlink 資訊中重新整理“已建立連線”的流量計數器
 msgid "Invalid or empty backup archive"
 msgstr "備份存檔無效或為空"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1018
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:144
 msgid "JSON dump"
 msgstr "JSON 輸出"
 
@@ -325,8 +350,8 @@ msgstr "本地介面"
 msgid "Local subnets"
 msgstr "本地子網"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:942
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1005
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:47
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:124
 msgid "MAC"
 msgstr "MAC"
 
@@ -340,7 +365,7 @@ msgid ""
 "forever."
 msgstr "保留的統計週期數據庫的最大數量，設定 0 表示不限制。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:876
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:13
 msgid "Netlink Bandwidth Monitor"
 msgstr "網路頻寬監視器"
 
@@ -352,9 +377,9 @@ msgstr "網路頻寬監視器 - 備份 / 恢復"
 msgid "Netlink Bandwidth Monitor - Configuration"
 msgstr "網路頻寬監視器 - 配置"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:636
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:696
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:814
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:473
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:531
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:636
 msgid "No data recorded yet."
 msgstr "暫無資料記錄。"
 
@@ -370,7 +395,7 @@ msgstr "僅統計來自或目標為這些子網的連線流量。"
 msgid "Preallocate database"
 msgstr "預分配資料庫"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:604
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:449
 msgid "Protocol"
 msgstr "協議"
 
@@ -399,11 +424,11 @@ msgstr "恢復"
 msgid "Restore Database Backup"
 msgstr "恢復資料庫備份"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:905
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:16
 msgid "Select accounting period:"
 msgstr "選擇統計週期："
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:597
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:444
 msgid "Source IP"
 msgstr "源 IP"
 
@@ -437,29 +462,43 @@ msgid ""
 "the limit to 0 will allow databases to grow indefinitely."
 msgstr "資料庫中的最大條目數量, 設定為 0 將允許資料庫無限增長。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:921
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:26
 msgid "Traffic / Host"
 msgstr "流量 / 主機"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:912
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:23
 msgid "Traffic Distribution"
 msgstr "流量分佈"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:491
-msgid "Up. (Bytes / Pkts.)"
-msgstr "上傳（位元組 / 資料包）"
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:303
+msgid "Up. (Bytes)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:304
+msgid "Up. (Pkts.)"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:287
+msgid "Upload"
+msgstr ""
+
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:51
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:89
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:128
+msgid "Upload (Bytes)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:945
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:976
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:1008
-msgid "Upload (Bytes / Packets)"
-msgstr "上傳（位元組 / 資料包）"
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:52
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:90
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:129
+msgid "Upload (Packets)"
+msgstr ""
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:958
+#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:70
 msgid "Upload / Application"
 msgstr "上傳 / 應用層協議"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:894
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:293
 msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
 msgstr "供應商：<big id=\"bubble-vendor\">Example Corp.</big>"
 
@@ -485,16 +524,28 @@ msgstr ""
 "是否預先分配資料庫最大可能佔用的記憶體大小。這主要適用於記憶體較小系統，這些"
 "系統在長時間執行之後可能無法滿足資料庫的記憶體需求。"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:285
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:88
 msgid "no traffic"
 msgstr "無流量資料"
 
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:498
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:506
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:511
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:598
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:670
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:675
-#: applications/luci-app-nlbwmon/luasrc/view/nlbw/display.htm:678
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:313
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:325
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:330
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:445
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:502
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:515
+#: applications/luci-app-nlbwmon/htdocs/luci-static/resources/view/nlbw.js:520
 msgid "other"
 msgstr "其他"
+
+#~ msgid "Down. (Bytes / Pkts.)"
+#~ msgstr "下載（位元組 / 資料包）"
+
+#~ msgid "Download (Bytes / Packets)"
+#~ msgstr "下載（位元組 / 資料包）"
+
+#~ msgid "Up. (Bytes / Pkts.)"
+#~ msgstr "上傳（位元組 / 資料包）"
+
+#~ msgid "Upload (Bytes / Packets)"
+#~ msgstr "上傳（位元組 / 資料包）"
diff --git a/applications/luci-app-olsr/po/ca/olsr.po b/applications/luci-app-olsr/po/ca/olsr.po
index 247b5e0e5..4de94e1e0 100644
--- a/applications/luci-app-olsr/po/ca/olsr.po
+++ b/applications/luci-app-olsr/po/ca/olsr.po
@@ -23,32 +23,34 @@ msgstr "Anuncis MID actius"
 msgid "Active OLSR nodes"
 msgstr "Nodes OLSR actius"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Anuncis de xarxa de màquines actives"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Ajusts avançats"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Permet els passarel·les amb NAT "
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Xarxa anunciada"
 
@@ -64,12 +66,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Adreça de difusió"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -88,11 +90,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Dispositiu"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -100,36 +107,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Habilita"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Habilita aquesta interfície."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Habilitat"
 
@@ -137,13 +145,13 @@ msgstr "Habilitat"
 msgid "Expected retransmission count"
 msgstr "Compte de retransmissió previst"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "Mètrica FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -153,26 +161,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Passarel·la"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Ajusts generals"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Ajusts generals"
 
@@ -190,8 +199,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -200,17 +209,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "Anuncis HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Interval HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Temps de validesa HNA"
 
@@ -219,22 +228,22 @@ msgstr "Temps de validesa HNA"
 msgid "HNA6 Announcements"
 msgstr "Anuncis HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Interval Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Temps de validesa Hello"
 
@@ -252,16 +261,18 @@ msgstr ""
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -277,18 +288,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Adreces IP"
 
@@ -298,85 +309,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "Difusió IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "Difusió selectiva IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -385,24 +398,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interfície"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -410,15 +425,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Interfícies"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -426,30 +441,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr "Protocol d'Internet"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Rutes OLSR conegudes"
 
@@ -457,30 +472,30 @@ msgstr "Rutes OLSR conegudes"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "Envelliment LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "Algoritme LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "Nivell LQ"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -494,28 +509,28 @@ msgstr "Últim salt"
 msgid "Legend"
 msgstr "Llegenda"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Biblioteca"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "Ajusts de qualitat d'enllaç"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -525,18 +540,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "Multiplicador de qualitat d'enllaç"
 
@@ -548,36 +563,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP d'interfície local"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "Interval MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "Temps de validesa MID"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "IP principal"
 
@@ -587,21 +603,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "Mètric"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Mode"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -618,8 +635,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "Llindar NAT"
 
@@ -631,7 +648,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "Veïns"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "IP del veí"
 
@@ -640,26 +658,26 @@ msgid "Neighbours"
 msgstr "Veïns"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Màscara de xarxa"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Xarxa"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Adreça de xarxa"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -684,30 +702,32 @@ msgstr "Anuncis OLSR - HNA"
 msgid "OLSR - HNA6-Announcements"
 msgstr "Anuncis OLSR - HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Connectors"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "Dimoni OLSR"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "Dimoni OLSR - Interfície"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "Connexions OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "Passarel·la OLSR"
 
@@ -725,11 +745,11 @@ msgstr ""
 msgid "Overview"
 msgstr "Visió de conjunt"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Visió de conjunt d'anuncis de xarxa de màquines OLSR actives"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Visió de conjunt de les connexions OLSR establertes actualment"
 
@@ -737,7 +757,7 @@ msgstr "Visió de conjunt de les connexions OLSR establertes actualment"
 msgid "Overview of currently known OLSR nodes"
 msgstr "Visió de conjunt dels nodes OLSR coneguts actualment"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Visió de conjunt de rutes conegudes actualment a altres nodes OLSR"
 
@@ -749,40 +769,41 @@ msgstr "Visió de conjunt de interfícies on està funcionant OLSR"
 msgid "Overview of known multiple interface announcements"
 msgstr "Visió de conjunt d'anuncis d'interfície múltiple coneguts"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "Visió de conjunt de les passarel·les intel·ligents en aquesta xarxa"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Configuració de connector"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Connectors"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "Taxa de sondeig"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefix"
 
@@ -810,7 +831,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr "Interfícies OSLR secundàries"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -841,36 +863,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "Anuncis de SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Estat"
 
@@ -890,34 +912,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "Interval TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Temps de validesa TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "Valor TOS"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -926,27 +948,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -954,10 +976,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "Sincronització i validitat"
 
@@ -965,8 +987,8 @@ msgstr "Sincronització i validitat"
 msgid "Topology"
 msgstr "Topologia"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -976,21 +998,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "No s'ha pogut connectar al dimoni OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Utilitza histèresi"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1006,28 +1030,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Pes"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1052,8 +1076,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Voluntat"
 
@@ -1062,40 +1086,42 @@ msgstr "Voluntat"
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Estat"
 
-#~ msgid "Device"
-#~ msgstr "Dispositiu"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/applications/luci-app-olsr/po/cs/olsr.po b/applications/luci-app-olsr/po/cs/olsr.po
index 974e29b3d..fe7e41eee 100644
--- a/applications/luci-app-olsr/po/cs/olsr.po
+++ b/applications/luci-app-olsr/po/cs/olsr.po
@@ -19,32 +19,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Pokročilé nastavení"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -60,12 +62,12 @@ msgstr "Špatné (SNR < 5)"
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -84,11 +86,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Zařízení"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Downlink"
 
@@ -96,36 +103,37 @@ msgstr "Downlink"
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Povolit"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Povolit toto rozhraní."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Povoleno"
 
@@ -133,13 +141,13 @@ msgstr "Povoleno"
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -149,26 +157,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Gateway"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Obecné nastavení"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Obecné nastavení"
 
@@ -186,8 +195,8 @@ msgid "Green"
 msgstr "Zelený"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -196,17 +205,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "HNA interval"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -214,22 +223,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -247,16 +256,18 @@ msgstr "Skrýt IPv6"
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Hostname"
 
@@ -272,18 +283,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IP adresy"
 
@@ -293,85 +304,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 multicast"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -380,24 +393,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Rozhraní"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -405,15 +420,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Rozhraní"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -421,30 +436,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr "Internet protokol"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -452,30 +467,30 @@ msgstr ""
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ algoritmus"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -489,28 +504,28 @@ msgstr "Poslední skok (hop)"
 msgid "Legend"
 msgstr "Legenda"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Knihovna"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -520,18 +535,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -543,36 +558,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP lokálního rozhraní"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "MID interval"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "Hlavní IP"
 
@@ -582,21 +598,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -613,8 +630,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -626,7 +643,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "Sousedé"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "IP souseda"
 
@@ -635,26 +653,26 @@ msgid "Neighbours"
 msgstr "Sousedé"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Maska sítě"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Síť"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -678,30 +696,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - pluginy"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -719,11 +739,11 @@ msgstr "Oranžový"
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -731,7 +751,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -743,40 +763,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Konfigurace pluginu"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefix"
 
@@ -804,7 +825,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -835,36 +857,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr "Úroveň šumu v dB"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -884,34 +906,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "TC interval"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS hodnota"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -920,27 +942,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -948,10 +970,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -959,8 +981,8 @@ msgstr ""
 msgid "Topology"
 msgstr "Topologie"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -970,21 +992,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1000,28 +1024,28 @@ msgstr "Velmi dobré (ETX < 2)"
 msgid "Very good (SNR > 30)"
 msgstr "Velmi dobré (SNR > 30)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Váha"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1046,8 +1070,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1056,33 +1080,35 @@ msgstr ""
 msgid "Yellow"
 msgstr "Žlutý"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "ne"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "ano"
-
-#~ msgid "Device"
-#~ msgstr "Zařízení"
diff --git a/applications/luci-app-olsr/po/el/olsr.po b/applications/luci-app-olsr/po/el/olsr.po
index 41e73c427..de62fa4fc 100644
--- a/applications/luci-app-olsr/po/el/olsr.po
+++ b/applications/luci-app-olsr/po/el/olsr.po
@@ -21,32 +21,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr "Ενεργοί κόμβοι OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Προχωρημένες Ρυθμίσεις"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -62,12 +64,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -86,11 +88,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Συσκευή"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -98,36 +105,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Ενεργοποίηση αυτής της διεπαφής."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -135,13 +143,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -151,26 +159,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Πύλη"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Γενικές ρυθμίσεις"
 
@@ -188,8 +197,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -198,17 +207,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -216,22 +225,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -249,16 +258,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -274,18 +285,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Διευθύνσεις IP"
 
@@ -295,85 +306,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -382,24 +395,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Διεπαφή"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -407,15 +422,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Διεπαφές"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -423,30 +438,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -454,30 +469,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -491,28 +506,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -522,18 +537,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -545,36 +560,37 @@ msgstr ""
 msgid "Links total"
 msgstr "Συνδέσεις σύνολο"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP τοπικής διεπαφής"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -584,21 +600,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -615,8 +632,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -628,7 +645,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -637,26 +655,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Δίκτυο"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Διεύθυνση δικτύου"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -680,30 +698,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR Δαίμονας"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR Δαίμονας - Διεπαφή"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR συνδέσεις"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "OLSR πύλη"
 
@@ -721,11 +741,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -733,7 +753,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -745,40 +765,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Πόρτα"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -806,7 +827,8 @@ msgstr "Διαδρομές"
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -837,36 +859,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -886,34 +908,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -922,27 +944,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -950,10 +972,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -961,8 +983,8 @@ msgstr ""
 msgid "Topology"
 msgstr "Τοπολογία"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -972,21 +994,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1002,28 +1026,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1048,8 +1072,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1058,33 +1082,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
-
-#~ msgid "Device"
-#~ msgstr "Συσκευή"
diff --git a/applications/luci-app-olsr/po/es/olsr.po b/applications/luci-app-olsr/po/es/olsr.po
index 990019b2b..5251e9dba 100644
--- a/applications/luci-app-olsr/po/es/olsr.po
+++ b/applications/luci-app-olsr/po/es/olsr.po
@@ -21,32 +21,34 @@ msgstr "Declaraciones MID activas"
 msgid "Active OLSR nodes"
 msgstr "Nodos OLSR activos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Declaraciones activas de máquinas en la red"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Configuración avanzada"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Permitir pasarelas con NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "Permitir seleccionar una pasarela IPv4 con NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Declarar enlace de subida"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Red declarada"
 
@@ -62,12 +64,12 @@ msgstr "Mal (SNR < 5)"
 msgid "Both values must use the dotted decimal notation."
 msgstr "Ambos valores en notación decimal con punto."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Dirección de propagación"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr "Sólo puede ser una dirección IPv4 o IPv6 válidas o \"por defecto\""
 
@@ -89,11 +91,16 @@ msgstr ""
 "No pude obtener datos. Asegúrese de que el plugin jsoninfo está instalado y "
 "permite conexiones desde localhost."
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Dispositivo"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Mostrar"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Enlace de bajada"
 
@@ -101,24 +108,25 @@ msgstr "Enlace de bajada"
 msgid "Download Config"
 msgstr "Configuración de descarga"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Activar"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -126,13 +134,13 @@ msgstr ""
 "Activar SmartGateway. Si se desactiva el resto de parámetros de SmartGateway "
 "se ignoran. \"No\" por defecto."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Activar esta interfaz."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Activado"
 
@@ -140,13 +148,13 @@ msgstr "Activado"
 msgid "Expected retransmission count"
 msgstr "Contador de retransmisión esperado"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "Métrica FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -162,26 +170,27 @@ msgstr ""
 "también, pero solo la actualiza si cambia el siguiente salto también. Por "
 "defecto \"flat\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr "Mecanismo Fisheye para TCs (marcado = activado). Activado por defecto"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Pasarela"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Configuración general"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Configuración general"
 
@@ -199,8 +208,8 @@ msgid "Green"
 msgstr "Verde"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -209,17 +218,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "Declaraciones HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Intervalo HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Tiempo de validez de HNA"
 
@@ -228,22 +237,22 @@ msgstr "Tiempo de validez de HNA"
 msgid "HNA6 Announcements"
 msgstr "Declaraciones HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Saludo"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Intervalo de saludo"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Tiempo de validez del saludo"
 
@@ -261,16 +270,18 @@ msgstr "Ocultar IPv6"
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "Saltos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Nombre de máquina"
 
@@ -291,8 +302,8 @@ msgstr ""
 "Las máquinas de una red OLSR pueden declarar conectividad con redes externas "
 "usando mensajes HNA."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -302,10 +313,10 @@ msgstr ""
 "histéresis da más robustez a la sensibilidad de enlace pero retrasa el "
 "registro de vecinos. \"Sí\" por defecto"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Direcciones IP"
 
@@ -317,17 +328,18 @@ msgstr ""
 "Versión IP a usar. Si se selecciona 6and4 se arrancarán una instancia de "
 "oslrd para cada protocolo."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "Propagar IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -337,13 +349,13 @@ msgstr ""
 "\"255.255.255.255\". Por defecto es \"0.0.0.0\" que hace que se use la "
 "interfaz de propagación IP."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 origen"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -351,21 +363,22 @@ msgstr ""
 "Dirección origen IPv4 para paquetes OLSR. Por defecto es \"0.0.0.0\" que "
 "hace que se use la interfaz de propagación IP."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "Multidifusión IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
@@ -373,25 +386,25 @@ msgstr ""
 "Dirección IPv6 de multidifusión. Por defecto es \"FF02::6D\", la dirección "
 "de multidifusión local en routers MANET."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "La red IPv6 debe escribirse en notación completa y el prefijo debe estar en "
 "notación CIDR."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 origen"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -401,13 +414,13 @@ msgstr ""
 "de este parámetro. Por defecto es \"0::/0\" que provoca el uso de un "
 "interfaz IP no local."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "Prefijo IPv6 para el enlace de subida"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -420,24 +433,26 @@ msgstr ""
 "1.0, pero debería aproximarse a 1.0 si se cambia.<br /><b>AVISO:</b> No debe "
 "usarse junto con la métrica etx_ffeth!<br />Por defecto es 1.0."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr "Este nodo usa NAT para conectar a internet. \"Sí\" por defecto."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interfaz"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -448,15 +463,15 @@ msgstr ""
 "Por defecto es \"mesh\"."
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Valores por defecto de los interfaces"
 
@@ -464,8 +479,8 @@ msgstr "Valores por defecto de los interfaces"
 msgid "Internet protocol"
 msgstr "Protocolo de Internet"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
@@ -473,17 +488,17 @@ msgstr ""
 "Intervalo de sondeo de cambios de configuración a interfaces de red (en "
 "segundos). Por defecto es \"2.5\"."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr "Valor no válido para LQMult-Value. Debe ser entre 0,01 y 1,0."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
@@ -491,7 +506,7 @@ msgstr ""
 "Valor no válido para LQMult-Value. Debe usar un número decimal entre 0,01 y "
 "1,0."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Rutas OLSR conocidas"
 
@@ -499,30 +514,30 @@ msgstr "Rutas OLSR conocidas"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ - Envejecimiento"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ - Algoritmo"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ - Ojo de pez"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ - Nivel"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -538,20 +553,20 @@ msgstr "Último salto"
 msgid "Legend"
 msgstr "Leyenda"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Biblioteca"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "Configuración de calidad de enlace"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -562,8 +577,8 @@ msgstr ""
 "cambios más lentos en el valor ETX. (los valores permitidos están entre 0.01 "
 "y 1.0)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -580,8 +595,8 @@ msgstr ""
 "incompatible de etx_ff que permite enlaces ethernet con ETX 0.1.<br />Por "
 "defecto \"etx_ff\""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -592,10 +607,10 @@ msgstr ""
 "calidad del enlace<br /><b>2</b> = use calidad del enlace para selección de "
 "MPR y enrutado<br />Por defecto es 2"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "Multilplicador de calidad de enlace"
 
@@ -607,36 +622,37 @@ msgstr "Media de enlaces por nodo"
 msgid "Links total"
 msgstr "Enlaces totales"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP de la interfaz local"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "Intervalo de MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "Tiempo de validez de MID"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "IP principal"
 
@@ -649,21 +665,22 @@ msgstr ""
 "cargado, configurado en el puerto 9090 y que acepta conexiones desde "
 "127.0.0.1."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "Métrica"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Modo"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -689,8 +706,8 @@ msgstr ""
 "<br />reducir LQ a 192.168.0.1 por la mitad: 192.168.0.1 0,5<br />reducir LQ "
 "a todos los nodos de esta interfaz el 20%: default 0,8"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "Umbral NAT"
 
@@ -702,7 +719,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "Vecinos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "IP vecina"
 
@@ -711,26 +729,26 @@ msgid "Neighbours"
 msgstr "Vecinos"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Máscara de red"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Red"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Dirección de red"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "Intervalo de muestreo de cambios de nic"
 
@@ -755,30 +773,32 @@ msgstr "OLSR - Declaraciones HNA"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - Declaraciones HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "Demonio OLSR"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "Demonio OLSR - Interfaz"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "Conexiones OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "Puerta de enlace OLSR"
 
@@ -796,11 +816,11 @@ msgstr "Naranja"
 msgid "Overview"
 msgstr "Resumen"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Resumen de declaraciones OLSR de máquinas activas"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Resumen de conexiones de OLSR vivas"
 
@@ -808,7 +828,7 @@ msgstr "Resumen de conexiones de OLSR vivas"
 msgid "Overview of currently known OLSR nodes"
 msgstr "Nodos conocidos OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Rutas conocidas a otros nodos OLSR"
 
@@ -820,40 +840,41 @@ msgstr "Resumen de interfaces con OLSR en ejecución"
 msgid "Overview of known multiple interface announcements"
 msgstr "Declaraciones de múltiples interfaces conocidas"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "Pasarelas inteligentes en esta red"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Configuración del plugin"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Plugins"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "Ratio de muestreo de paquetes OLSR en segundos. Por defecto es 0.05."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "Tasa de muestreo"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Puerto"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefijo"
 
@@ -884,7 +905,8 @@ msgstr "Rutas"
 msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundarias"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -922,25 +944,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr "Ratio señal / ruido en dB"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "Declaraciones SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "SmartGateway no está configurado."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "Dirección origen"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -948,12 +970,12 @@ msgstr ""
 "Especifica la velocidad del enlace en kilobits/s. El primer parámetro es la "
 "subida y el segundo la bajada. Por defecto es \"128 1024\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "Velocidad de subida"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Estado"
 
@@ -973,34 +995,34 @@ msgstr "Ratio de éxito de paquetes recibidos de la vecindad"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "Ratio de éxito de paquetes enviados a la vecindad"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "Intervalo TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Validez de TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -1014,8 +1036,8 @@ msgstr ""
 "ethernet. Puede visitar <a href='http://www.olsr.org'>olsrd.org</a> para "
 "ayuda y documentación."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -1023,13 +1045,13 @@ msgstr ""
 "Willingness fija a usar. Si no se establece se calculará dinámicamente "
 "basándose en el estado de la batería y la corriente. Por defecto es 3."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "Interfaz a usar por OLSRD."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -1037,8 +1059,8 @@ msgstr ""
 "Puerto a usar por OLSR. Debería ser 698 tal y como asigna IANA. Puede tener "
 "un valor entre 1 y 65535."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1050,10 +1072,10 @@ msgstr ""
 "de dirección. La longitud máxima del prefijo es 64 bits. Por defecto es "
 "\"::/0\" (sin prefijo)."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "Tiempo y validez"
 
@@ -1061,8 +1083,8 @@ msgstr "Tiempo y validez"
 msgid "Topology"
 msgstr "Topología"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1074,21 +1096,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "¡No puedo conectar con el demonio OLSR!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "Enlace saliente"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "El enlace saliente usa NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Usar histéresis"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr "Tiempo de validez"
 
@@ -1104,29 +1128,29 @@ msgstr "Muy bien (ETX < 2)"
 msgid "Very good (SNR > 30)"
 msgstr "Muy bien (SNR > 30)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 "Aviso: kmod-ipip no está instalado. Sin kmod-ipip SmartGateway no funcionará."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Peso"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1164,8 +1188,8 @@ msgstr ""
 "buscando una HNA local de 0.0.0.0/0, ::ffff:0:0/96 o 2000::/3. Por defecto "
 "\"both\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Willingness"
 
@@ -1174,40 +1198,42 @@ msgstr "Willingness"
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "no"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "sí"
 
 #~ msgid "Status"
 #~ msgstr "Estado"
 
-#~ msgid "Device"
-#~ msgstr "Dispositivo"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/applications/luci-app-olsr/po/fr/olsr.po b/applications/luci-app-olsr/po/fr/olsr.po
index 376f92a1f..a906f451f 100644
--- a/applications/luci-app-olsr/po/fr/olsr.po
+++ b/applications/luci-app-olsr/po/fr/olsr.po
@@ -21,32 +21,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -62,12 +64,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -86,11 +88,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -98,36 +105,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -135,13 +143,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -151,26 +159,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -188,8 +197,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -198,17 +207,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -216,22 +225,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -249,16 +258,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -274,18 +285,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -295,85 +306,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 multidiffusion"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -382,24 +395,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -407,15 +422,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -423,30 +438,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -454,30 +469,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -491,28 +506,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -522,18 +537,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -545,36 +560,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -584,21 +600,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -615,8 +632,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -628,7 +645,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -637,26 +655,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -680,30 +698,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -721,11 +741,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -733,7 +753,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -745,40 +765,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -806,7 +827,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -837,36 +859,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -886,34 +908,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -922,27 +944,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -950,10 +972,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -961,8 +983,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -972,21 +994,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1002,28 +1026,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1048,8 +1072,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1058,30 +1082,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/he/olsr.po b/applications/luci-app-olsr/po/he/olsr.po
index 8a8a3e848..5d3482112 100644
--- a/applications/luci-app-olsr/po/he/olsr.po
+++ b/applications/luci-app-olsr/po/he/olsr.po
@@ -16,32 +16,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -57,12 +59,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -81,11 +83,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -93,36 +100,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -130,13 +138,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -146,26 +154,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -183,8 +192,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -193,17 +202,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -211,22 +220,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -244,16 +253,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -269,18 +280,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -290,85 +301,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -377,24 +390,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -402,15 +417,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -418,30 +433,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -449,30 +464,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -486,28 +501,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -517,18 +532,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -540,36 +555,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -579,21 +595,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -610,8 +627,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -623,7 +640,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -632,26 +650,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -675,30 +693,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -716,11 +736,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -728,7 +748,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -740,40 +760,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -801,7 +822,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -832,36 +854,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -881,34 +903,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -917,27 +939,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -945,10 +967,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -956,8 +978,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -967,21 +989,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -997,28 +1021,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1043,8 +1067,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1053,30 +1077,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/hu/olsr.po b/applications/luci-app-olsr/po/hu/olsr.po
index 8a8a3e848..5d3482112 100644
--- a/applications/luci-app-olsr/po/hu/olsr.po
+++ b/applications/luci-app-olsr/po/hu/olsr.po
@@ -16,32 +16,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -57,12 +59,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -81,11 +83,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -93,36 +100,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -130,13 +138,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -146,26 +154,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -183,8 +192,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -193,17 +202,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -211,22 +220,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -244,16 +253,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -269,18 +280,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -290,85 +301,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -377,24 +390,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -402,15 +417,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -418,30 +433,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -449,30 +464,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -486,28 +501,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -517,18 +532,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -540,36 +555,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -579,21 +595,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -610,8 +627,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -623,7 +640,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -632,26 +650,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -675,30 +693,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -716,11 +736,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -728,7 +748,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -740,40 +760,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -801,7 +822,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -832,36 +854,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -881,34 +903,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -917,27 +939,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -945,10 +967,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -956,8 +978,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -967,21 +989,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -997,28 +1021,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1043,8 +1067,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1053,30 +1077,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/it/olsr.po b/applications/luci-app-olsr/po/it/olsr.po
index 116f92982..da2384909 100644
--- a/applications/luci-app-olsr/po/it/olsr.po
+++ b/applications/luci-app-olsr/po/it/olsr.po
@@ -21,32 +21,34 @@ msgstr "Annunci MID attivi"
 msgid "Active OLSR nodes"
 msgstr "Nodi OLSR attivi"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Annunci rete host attiva"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Opzioni avanzate"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Permetti gateway con NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "Permetti l'uso di gateway in uscita con NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Annuncia uplink"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Rete da annnunciare"
 
@@ -62,12 +64,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr "Entrambi i valori devono essere nella notazione decimale puntata"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Indirizzo di broadcast"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -86,11 +88,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Periferica"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Display"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Downlink"
 
@@ -98,24 +105,25 @@ msgstr "Downlink"
 msgid "Download Config"
 msgstr "Configurazione Download"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Attiva"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -123,13 +131,13 @@ msgstr ""
 "Abitita SmartGateway. Se è disattivata, tutti gli altri parametri "
 "SmartGateway verrano ignorati. Predefinito è \"no\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Attiva questa interfaccia."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Attivato"
 
@@ -137,13 +145,13 @@ msgstr "Attivato"
 msgid "Expected retransmission count"
 msgstr "Expected retransmission count"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "Metrica FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -153,26 +161,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Gateway"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Impostazioni Generali"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Impostazioni Generali"
 
@@ -190,8 +199,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -200,17 +209,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "Annuncio di HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Intervallo HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Durata di validità HNA"
 
@@ -219,22 +228,22 @@ msgstr "Durata di validità HNA"
 msgid "HNA6 Announcements"
 msgstr "Annuncio di HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Ciao"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Intervallo Saluto"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Durata validità Saluto"
 
@@ -252,16 +261,18 @@ msgstr ""
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "Hops"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Nome Host"
 
@@ -277,8 +288,8 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -288,10 +299,10 @@ msgstr ""
 "robustezza alla sensibilità del link ma rallenta la registrazione dei "
 "vicini. Default è \"si\""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Indirizzi IP"
 
@@ -303,17 +314,18 @@ msgstr ""
 "Versione IP da usare. Se entrambe sono selezionate una istanza di olsrd è "
 "avviata per ogni versione."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -323,13 +335,13 @@ msgstr ""
 "255.255.255.255. Default is 0.0.0.0, il che abilita l'uso dell'ip di "
 "broadcast di default."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 source"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -337,45 +349,46 @@ msgstr ""
 "IPv4 source per i pacchetti uscenti da OLSR. Predefinito \"0.0.0.0\", il che "
 "abilita l'uso dell'IP dell'interfaccia di uscita."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 multicast"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "IPv6 network deve essere specificata in full notation, il prefisso deve "
 "essere in CIDR notation."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 source"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -385,13 +398,13 @@ msgstr ""
 "questo parametro. Predefinito è \"0::/0\", il che abilita l'uso di un IP non-"
 "linklocal."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "IPv6-Prefix dell' uplink"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -405,25 +418,27 @@ msgstr ""
 "valore vicino a 1.0. <br /><b>ATTENZIONE:</b> Questo valore non deve essere "
 "utilizzato insieme con la metrica etx_ffeth!<br />Defaults a \"1.0\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 "Se questo nodo usa un NAT per connettersi a Internet. Predefinito è \"si\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interfaccia"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -431,15 +446,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -447,30 +462,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -478,30 +493,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -515,28 +530,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -546,18 +561,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -569,36 +584,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -608,21 +624,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -639,8 +656,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -652,7 +669,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -661,26 +679,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -705,30 +723,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr "Annuncio di HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -746,11 +766,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -758,7 +778,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -770,40 +790,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -831,7 +852,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -862,36 +884,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -911,34 +933,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -947,27 +969,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -975,10 +997,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -986,8 +1008,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -997,21 +1019,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Impossibile connetersi al demone OLSR!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "L'uplink usa il NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Usa l'isteresi"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1027,28 +1051,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Peso"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1086,8 +1110,8 @@ msgstr ""
 "cercando un HNA del tipo 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default "
 "setting is \"both\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1096,33 +1120,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
-
-#~ msgid "Device"
-#~ msgstr "Periferica"
diff --git a/applications/luci-app-olsr/po/ja/olsr.po b/applications/luci-app-olsr/po/ja/olsr.po
index 97f220999..31de79d87 100644
--- a/applications/luci-app-olsr/po/ja/olsr.po
+++ b/applications/luci-app-olsr/po/ja/olsr.po
@@ -21,32 +21,34 @@ msgstr "アクティブなMID(Multi Interface Declaration) 通知"
 msgid "Active OLSR nodes"
 msgstr "アクティブなOLSRノード"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "アクティブなホストネットワーク通知"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "NATを使用するゲートウェイを選択可能にする"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "NATを介してパケットを送信するIPv4 ゲートウェイを選択可能にします"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "通知するアップリンク"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "通知ネットワーク"
 
@@ -62,12 +64,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr "どちらの値もドット付き十進数の形式で入力してください。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "ブロードキャストアドレス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -86,11 +88,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "デバイス"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "ディスプレイ"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "ダウンリンク"
 
@@ -98,24 +105,25 @@ msgstr "ダウンリンク"
 msgid "Download Config"
 msgstr "設定ダウンロード"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "有効"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -123,13 +131,13 @@ msgstr ""
 "スマートゲートウェイを有効にします。無効の場合、その他全てのスマートゲート"
 "ウェイの設定値は無視されます。標準設定は\"無効\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "このインターフェースを有効にします。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "有効"
 
@@ -137,13 +145,13 @@ msgstr "有効"
 msgid "Expected retransmission count"
 msgstr "再送数の期待値"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "FIB メトリック"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -159,26 +167,27 @@ msgstr ""
 "リック値として使用しますが、次ホップが変更した場合のみ更新を行います。標準設"
 "定は\"flat\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr "TCsのfisheyeメカニズムを使用します。標準設定は\"有効\"です。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "一般設定"
 
@@ -196,8 +205,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -206,17 +215,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "HNA 通知"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "HNA 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "HNA 有効時間"
 
@@ -225,22 +234,22 @@ msgstr "HNA 有効時間"
 msgid "HNA6 Announcements"
 msgstr "HNA 通知"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Hello 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Hello 有効時間"
 
@@ -258,16 +267,18 @@ msgstr ""
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "ホップ"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "ホスト名"
 
@@ -283,8 +294,8 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -294,10 +305,10 @@ msgstr ""
 "効)。ヒステリシスはリンク検出に対するロバスト性を向上させますが、隣接ノードの"
 "登録が遅くなります。標準設定は\"有効\"です。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IPアドレス"
 
@@ -309,17 +320,18 @@ msgstr ""
 "使用するIPプロトコルバージョンを指定します。6and4が選択された場合、各プロトコ"
 "ルに対して1つづつOLSRdインスタンスが起動します。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "IPv4 ブロードキャスト"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -329,13 +341,13 @@ msgstr ""
 "255.255.255.255が挙げられます。標準設定は\"0.0.0.0\"であり、インターフェース"
 "のブロードキャストIPを使用します。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 送信元"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -343,21 +355,22 @@ msgstr ""
 "送信するOLSRパケットのIPv4送信元アドレスです。標準設定は\"0.0.0.0\"であり、イ"
 "ンターフェースのIPを使用します。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 マルチキャスト"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
@@ -365,25 +378,25 @@ msgstr ""
 "IPv6 マルチキャストアドレスを設定します。標準はMANETルーターが使用するリンク"
 "ローカル・マルチキャストである\"FF02::6D\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "IPv6 ネットワークアドレスは省略せずに入力してください。プレフィクスはCIDR形式"
 "で入力してください。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 送信元"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -393,13 +406,13 @@ msgstr ""
 "フィクス値に一致するものを選択します。標準設定は\"0::/0\"であり、リンクローカ"
 "ルIPでないインターフェースIPを使用します。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "アップリンクIPv6 プレフィクス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -413,26 +426,28 @@ msgstr ""
 "<br /><b>警告:</b>このパラメータはetx_ffeth メトリックと同時に使用しないでく"
 "ださい!<br />標準設定は\"1.0\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 "このノードがNATを使用してインターネットに接続する場合、有効にしてください。標"
 "準設定は\"有効\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "インターフェース"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -443,15 +458,15 @@ msgstr ""
 "\"です。標準設定は\"mesh\"です。"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "インターフェース"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "インターフェース デフォルト設定"
 
@@ -459,8 +474,8 @@ msgstr "インターフェース デフォルト設定"
 msgid "Internet protocol"
 msgstr "インターネットプロトコル"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
@@ -468,23 +483,23 @@ msgstr ""
 "ネットワーク・インターフェースの設定が変更されたかをチェックするポーリング間"
 "隔を秒単位で設定します。標準設定は\"2.5\"です。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "OLSR ルーティング"
 
@@ -492,30 +507,30 @@ msgstr "OLSR ルーティング"
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ エイジング"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ アルゴリズム"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ レベル"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -529,20 +544,20 @@ msgstr "最終ホップ"
 msgid "Legend"
 msgstr "凡例"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "ライブラリ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "リンク品質 (LQ) 設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -552,8 +567,8 @@ msgstr ""
 "効)。etx_float及びetx_fpmの値の調整を行います。値が小さくなると、ETX値の変化"
 "が遅くなります。設定可能な値は0.01-1.0です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -570,8 +585,8 @@ msgstr ""
 "す。イーサネットのリンクにETX 0.1を設定することができます<br />標準設定は"
 "\"etx_ff\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -582,10 +597,10 @@ msgstr ""
 "<br /><b>2</b> = MPR集合及びルーティングにリンク品質を加味する<br />標準設定"
 "は\"2\"です。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "リンク品質 (LQ) マルチプリケーター"
 
@@ -597,36 +612,37 @@ msgstr "ノードあたりのリンク数 (平均)"
 msgid "Links total"
 msgstr "リンク数の合計"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "ローカルインターフェース IP"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "MID 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "MID 有効時間"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "メインIP"
 
@@ -636,21 +652,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "メトリック"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "モード"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -672,8 +689,8 @@ msgstr ""
 "192.168.0.1 0.5<br />このインターフェースから全てのノードへ対して20%減らす場"
 "合: default 0.8"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "NAT しきい値"
 
@@ -685,7 +702,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "隣接ノード"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "隣接ノード IP"
 
@@ -694,26 +712,26 @@ msgid "Neighbours"
 msgstr "隣接ノード"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "ネットマスク"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "ネットワーク"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "ネットワークアドレス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "NIC変更ポーリング間隔"
 
@@ -738,30 +756,32 @@ msgstr "OLSR - HNA (Host and Network Association) 通知"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA (Host and Network Association) 通知"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - プラグイン"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR デーモン"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR デーモン - インターフェース"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR コネクション"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "OLSR ゲートウェイ"
 
@@ -779,11 +799,11 @@ msgstr ""
 msgid "Overview"
 msgstr "概要"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "現在アクティブなOLSR HNA 一覧"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "現在確立済のOLSR接続一覧"
 
@@ -791,7 +811,7 @@ msgstr "現在確立済のOLSR接続一覧"
 msgid "Overview of currently known OLSR nodes"
 msgstr "現在既知のOLSRノードの一覧"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "現在のその他のOLSRノードへの経路一覧"
 
@@ -803,40 +823,41 @@ msgstr "OLSR稼働中のインターフェース一覧"
 msgid "Overview of known multiple interface announcements"
 msgstr "通知されているマルチ・インターフェースの一覧"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "ネットワーク内のスマート・ゲートウェイ一覧"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "プラグイン設定"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "OLSRソケットのポーリング間隔を秒単位で設定します。標準は0.05です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "ポーリング間隔"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "ポート"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "プレフィックス"
 
@@ -868,7 +889,8 @@ msgstr "経路"
 msgid "Secondary OLSR interfaces"
 msgstr "セカンダリOLSR インターフェース"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -906,25 +928,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "SmartGW 通知"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "スマート・ゲートウェイ(SmartGW)は設定されていません。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "送信元アドレス"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -932,12 +954,12 @@ msgstr ""
 "アップリンク速度をキロビット/秒で設定してください。1つ目のパラメータは上り、2"
 "つ目のパラメータは下りのストリームです。標準は\"128 1024\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "アップリンク速度"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "状態"
 
@@ -957,34 +979,34 @@ msgstr "隣接ノードから受信したパケットの受信成功率"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "隣接ノードへ送信したパケットの送信成功率"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "TC 送信間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "TC 有効時間"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS値"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -998,8 +1020,8 @@ msgstr ""
 "ん全てのイーサネットデバイスでも使用可能です。<a href='http://www.olsr."
 "org'>olsrd.org</a>にアクセスして、ヘルプ及びドキュメントを参照してください。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -1007,13 +1029,13 @@ msgstr ""
 "willingnessを固定する場合に使用します。willingnessが設定されていない場合、"
 "バッテリや電源のステータスによって動的に計算されます。標準は\"3\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "OLSRdが使用するインターフェースです。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -1021,8 +1043,8 @@ msgstr ""
 "OLSRが使用するポート番号です。通常、このポート番号はIANAがアサインした698番で"
 "あるべきです。1-65535の間で設定可能です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1030,10 +1052,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "送信間隔及び有効時間"
 
@@ -1041,8 +1063,8 @@ msgstr "送信間隔及び有効時間"
 msgid "Topology"
 msgstr "トポロジー"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1054,21 +1076,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "OLSRデーモンに接続できません！"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "アップリンク"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "NATを使用して上位ネットワークに接続する"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "ヒステリシスを使用する"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1084,12 +1108,12 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1097,17 +1121,17 @@ msgstr ""
 "警告: kmod-ipipがインストールされていません。スマートゲートウェイはkmod-ipip"
 "なしでは動作しません。まず初めにインストールを行なってください。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Weight"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1145,8 +1169,8 @@ msgstr ""
 "ローカルのHNAである0.0.0.0/0、::ffff:0:0/96、2000::/3を探索することで検出しま"
 "す。標準設定は、\"both\"です。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Willingness"
 
@@ -1155,40 +1179,42 @@ msgstr "Willingness"
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "ステータス"
 
-#~ msgid "Device"
-#~ msgstr "デバイス"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/applications/luci-app-olsr/po/ms/olsr.po b/applications/luci-app-olsr/po/ms/olsr.po
index 7aa13f1dc..f02ff69a9 100644
--- a/applications/luci-app-olsr/po/ms/olsr.po
+++ b/applications/luci-app-olsr/po/ms/olsr.po
@@ -15,32 +15,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -56,12 +58,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -80,11 +82,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -92,36 +99,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -129,13 +137,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -145,26 +153,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -182,8 +191,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -192,17 +201,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -210,22 +219,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -243,16 +252,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -268,18 +279,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -289,85 +300,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -376,24 +389,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -401,15 +416,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -417,30 +432,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -448,30 +463,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -485,28 +500,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -516,18 +531,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -539,36 +554,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -578,21 +594,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -609,8 +626,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -622,7 +639,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -631,26 +649,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -674,30 +692,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -715,11 +735,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -727,7 +747,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -739,40 +759,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -800,7 +821,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -831,36 +853,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -880,34 +902,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -916,27 +938,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -944,10 +966,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -955,8 +977,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -966,21 +988,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -996,28 +1020,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1042,8 +1066,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1052,30 +1076,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/no/olsr.po b/applications/luci-app-olsr/po/no/olsr.po
index 8a8a3e848..5d3482112 100644
--- a/applications/luci-app-olsr/po/no/olsr.po
+++ b/applications/luci-app-olsr/po/no/olsr.po
@@ -16,32 +16,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -57,12 +59,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -81,11 +83,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -93,36 +100,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -130,13 +138,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -146,26 +154,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -183,8 +192,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -193,17 +202,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -211,22 +220,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -244,16 +253,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -269,18 +280,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -290,85 +301,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -377,24 +390,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -402,15 +417,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -418,30 +433,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -449,30 +464,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -486,28 +501,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -517,18 +532,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -540,36 +555,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -579,21 +595,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -610,8 +627,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -623,7 +640,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -632,26 +650,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -675,30 +693,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -716,11 +736,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -728,7 +748,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -740,40 +760,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -801,7 +822,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -832,36 +854,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -881,34 +903,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -917,27 +939,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -945,10 +967,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -956,8 +978,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -967,21 +989,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -997,28 +1021,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1043,8 +1067,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1053,30 +1077,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/pl/olsr.po b/applications/luci-app-olsr/po/pl/olsr.po
index d69a3fbf7..e2790e44f 100644
--- a/applications/luci-app-olsr/po/pl/olsr.po
+++ b/applications/luci-app-olsr/po/pl/olsr.po
@@ -20,32 +20,34 @@ msgstr "Aktywne ogłoszenia MID"
 msgid "Active OLSR nodes"
 msgstr "Aktywne węzły OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Aktywne ogłoszenia hostnet"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Ustawienia zaawansowane"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Zezwól na bramy z NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "Zezwól na wybieranie wychodzącej bramy IPv4 przez NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Ogłaszaj uplink"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Ogłaszana sieć"
 
@@ -63,12 +65,12 @@ msgstr ""
 "Obie wartości muszą używać zapisu dziesiętnego z kropką przed częścią "
 "dziesiętną."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Adres rozgłoszeniowy (broadcast)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -87,11 +89,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Urządzenie"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Wyświetl"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Downlink"
 
@@ -99,24 +106,25 @@ msgstr "Downlink"
 msgid "Download Config"
 msgstr "Ustawienia pobierania"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Włącz"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -124,13 +132,13 @@ msgstr ""
 "Włącz SmartGateway. Jeśli wyłączone, wszystkie inne parametry SmartGateway "
 "są ignorowane. Domyślnie jest wyłączone."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Włącz ten interfejs."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Włączone"
 
@@ -138,13 +146,13 @@ msgstr "Włączone"
 msgid "Expected retransmission count"
 msgstr "Oczekiwana wartość retransmisji"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "Metryka FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -155,28 +163,29 @@ msgid ""
 msgstr ""
 
 # skorzystałem z niemieckiego tłumaczenia
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 "Mechanizm Fisheye dla TCs (zaznaczone oznacza \"włączone\"). Domyślnie jest "
 "\"włączone\""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Brama"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Ustawienia ogólne"
 
@@ -194,8 +203,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -204,17 +213,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "Ogłoszenia HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Interwał HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Czas poprawności HNA"
 
@@ -223,22 +232,22 @@ msgstr "Czas poprawności HNA"
 msgid "HNA6 Announcements"
 msgstr "Ogłoszenia HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Interwał Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Czas poprawności Hello"
 
@@ -256,16 +265,18 @@ msgstr ""
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "Skoki (hops)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Nazwa hosta"
 
@@ -286,18 +297,18 @@ msgstr ""
 "Hosty w sieci OLSR mogą ogłaszać połączenia z zewnętrznymi sieciami poprzez "
 "wiadomości HNA."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Adresy IP"
 
@@ -309,17 +320,18 @@ msgstr ""
 "Wersja protokołu IP. Jeśli jest wybrana 6and4 wtedy instancja olsrd jest "
 "uruchomiona dla każdego protokołu."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "Rozgłaszanie IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -329,13 +341,13 @@ msgstr ""
 "Przydatnym przykładem byłoby 255.255.255.255. Domyślna wartość to "
 "\"0.0.0.0\" - jest wtedy używany adres rozgłoszeniowy interfejsu."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "Źródło IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -343,22 +355,23 @@ msgstr ""
 "Adres źródłowy IPv4 dla wychodzących pakietów. Domyślna wartość to "
 "\"0.0.0.0\" - jest wtedy używany adres IP interfejsu."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "Multicast IPv6"
 
 # Nie mam pojęcia, jak to lepiej przetłumaczyć, ale w moich tłumaczeniach kieruję się zasadą "release early, release often".
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
@@ -366,24 +379,24 @@ msgstr ""
 "Adres multicast IPv6. Domyślna wartość to \"FF02::6D\", multicast lokalnego "
 "routera."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "Sieć IPv6 musi być podana w pełnej notacji, prefiks musi być w notacji CIDR."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "Źródło IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -393,13 +406,13 @@ msgstr ""
 "będzie pasował do tego prefiksu. Domyślna wartość to \"0::/0\" - jest wtedy "
 "używany adres IP interfejsu."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -408,24 +421,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr "Czy węzeł korzysta z NAT do połączenia z Internetem. Domyślnie \"Tak\""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interfejs"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -436,16 +451,16 @@ msgstr ""
 "\"mesh\"."
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Interfejsy"
 
 # by Google :D po części
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Standardy interfejsów"
 
@@ -453,30 +468,30 @@ msgstr "Standardy interfejsów"
 msgid "Internet protocol"
 msgstr "Protokół internetowy"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Znane ścieżki OLSR"
 
@@ -484,30 +499,30 @@ msgstr "Znane ścieżki OLSR"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "Starzenie się LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "Algorytm LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ-Fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "Poziom LQ"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -521,29 +536,29 @@ msgstr "Ostatni skok (hop)"
 msgid "Legend"
 msgstr "Legenda"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Biblioteka"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #, fuzzy
 msgid "Link Quality Settings"
 msgstr "Ustawienia jakości linków"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -553,18 +568,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "Mnożnik LinkQuality"
 
@@ -576,36 +591,37 @@ msgstr "Linków na węzeł (średnio)"
 msgid "Links total"
 msgstr "Linków w sumie"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP lokalnego interfejsu"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "Interwał MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "Czas poprawności MID"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "Główny IP"
 
@@ -615,22 +631,23 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 #, fuzzy
 msgid "Metric"
 msgstr "Miara"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Tryb"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -647,8 +664,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "Próg NAT"
 
@@ -660,7 +677,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "Sąsiedzi"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "IP sąsiadów"
 
@@ -669,26 +687,26 @@ msgid "Neighbours"
 msgstr "Sąsiedzi"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Maska sieciowa"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Sieć"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Adres sieci"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -713,30 +731,32 @@ msgstr "OLSR - ogłoszenia HNA"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - ogłoszenia HNA"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - pluginy"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "Demon OLSR"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "Demon OLSR - interfejs"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "Połączenia OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "Brama OLSR"
 
@@ -754,11 +774,11 @@ msgstr ""
 msgid "Overview"
 msgstr "Przegląd"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Przegląd aktywnych ogłoszeń hostnet OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Przegląd nawiązanych połączeń OLSR"
 
@@ -766,7 +786,7 @@ msgstr "Przegląd nawiązanych połączeń OLSR"
 msgid "Overview of currently known OLSR nodes"
 msgstr "Przegląd znanych węzłów OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Przegląd znanych tras do innych węzłów OLSR"
 
@@ -778,40 +798,41 @@ msgstr "Przegląd interfejsów z włączonym OLSR"
 msgid "Overview of known multiple interface announcements"
 msgstr "Przegląd znanych wielointerfejsowych ogłoszeń"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "Przegląd bram SmartGateway w tej sieci"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Ustawienia pluginu"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefiks"
 
@@ -839,7 +860,8 @@ msgstr "Trasy (routes)"
 msgid "Secondary OLSR interfaces"
 msgstr "Zapasowy interfejs OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -870,36 +892,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "Ogłoszenia SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "SmartGateway jest nieskonfigurowane."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "Adres źródłowy"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Stan"
 
@@ -921,34 +943,34 @@ msgstr "Wartość poprawnie otrzymanych od sąsiada pakietów"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "Wartość poprawnie wysłanych pakietów do sąsiada"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "Interwał TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Czas poprawności TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "Wartość TOS"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -957,20 +979,20 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "Interfejs, który powinien oferować OLSRd."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -978,8 +1000,8 @@ msgstr ""
 "Port używany przez OLSR. Zwykle powinien pozostać na przydzielonym przez "
 "IANA porcie 698. Może mieć wartość pomiędzy 1 a 65535."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -987,10 +1009,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -998,8 +1020,8 @@ msgstr ""
 msgid "Topology"
 msgstr "Topologia"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1009,21 +1031,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Połączenie z demonem OLSR nieudane!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "Uplink"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "Uplink używa NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Używaj histerezy"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1039,12 +1063,12 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1052,17 +1076,17 @@ msgstr ""
 "Uwaga: kmod-ipip nie jest zainstalowany. Bez kmod-ipip bramy SmartGateway "
 "nie będą działać. Proszę go zainstalować."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Waga"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1094,8 +1118,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Gotowość"
 
@@ -1104,40 +1128,42 @@ msgstr "Gotowość"
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Status"
 
-#~ msgid "Device"
-#~ msgstr "Urządzenie"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/applications/luci-app-olsr/po/pt-br/olsr.po b/applications/luci-app-olsr/po/pt-br/olsr.po
index 3b8753159..c88fad453 100644
--- a/applications/luci-app-olsr/po/pt-br/olsr.po
+++ b/applications/luci-app-olsr/po/pt-br/olsr.po
@@ -23,32 +23,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr "Nós OLSR ativos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Anúncios ativos de equipamentos"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Configurações Avançadas"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Permitir rotadores com NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "Permitir a seleção de rotador de saída IPv4 com NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Anunciar enlace superior (uplink)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Rede anunciada"
 
@@ -66,13 +68,13 @@ msgstr "Ruim (SNR < 5)"
 msgid "Both values must use the dotted decimal notation."
 msgstr "Ambos os valores devem usar a notação decimal com pontos."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Endereço de broadcast"
 
 # 20140621: edersg: tradução
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 "Somente pode ser um endereço IPv4 ou IPv6 válidos ou um endereço 'padrão'"
@@ -98,11 +100,16 @@ msgstr ""
 "jsoninfo está instalada e permite conexões a partir da sua máquina local "
 "(localhost)."
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Dispositivo"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Visão"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Enlace inferior (downlink)"
 
@@ -111,24 +118,25 @@ msgstr "Enlace inferior (downlink)"
 msgid "Download Config"
 msgstr "Configuração do Recebimento de Dados "
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Habilitar"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -136,13 +144,13 @@ msgstr ""
 "Habilita o SmartGateway. Se isto está desabilitado, então todos os demais "
 "parâmetros do SmartGateway são ignorados. Padrão é \"não\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Habilita esta interface."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -150,13 +158,13 @@ msgstr "Habilitado"
 msgid "Expected retransmission count"
 msgstr "Contagem esperada de retransmissões"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "Métrica FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -173,28 +181,29 @@ msgstr ""
 "atualiza a contagem de saltos se o próximo salto também mudar. O padrão é "
 "\"flat\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 "Mecanismo Fisheye para <abbr title=\"Topology Control, Controle de Topologia"
 "\">TC</abbr>s (marcado significa ligado). O padrão é \"ligado\""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Roteador"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Configurações Gerais"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Configurações gerais"
 
@@ -215,8 +224,8 @@ msgid "Green"
 msgstr "Verde"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -229,19 +238,19 @@ msgstr ""
 "Anúncios do <abbr title=\"Host and network association, Associação de "
 "equipamentos e redes\">HNA</abbr>"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 "Intervalo entre <abbr title=\"Host and network association, Associação de "
 "equipamentos e redes\">HNA</abbr>"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 "Validade do <abbr title=\"Host and network association, Associação de "
@@ -253,22 +262,22 @@ msgstr ""
 "Anúncios do <abbr title=\"Host and network association, Associação de "
 "equipamentos e redes\">HNA</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Saudação (Hello)"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Intervalo entre Saudações (Hello)"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Validade da Saudação (Hello)"
 
@@ -288,16 +297,18 @@ msgstr "Ocultar IPv6"
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "Saltos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Nome do equipamento"
 
@@ -318,8 +329,8 @@ msgstr ""
 "redes externas usando mensagens HNA."
 
 # Hysteresis é Histerese que significa "retardo"
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -329,10 +340,10 @@ msgstr ""
 "de saltos), Retardo incrementa a robustez da sensibilidade do enlace mas "
 "atrasa o registro dos vizinhos. O padrão é \"sim\""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Endereços IP"
 
@@ -344,17 +355,18 @@ msgstr ""
 "Versão do IP para usar. Se 6and4 for selecionado, então uma instância é "
 "disparada para cada protocolo."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "Endereço IPv4 de Broadcast"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -364,13 +376,13 @@ msgstr ""
 "seria 255.255.255.255. O padrão é \"0.0.0.0\", que indica o uso do endereço "
 "IP de broadcast da interface."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "Origem IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -379,21 +391,22 @@ msgstr ""
 "255.255.255.255. O padrão é \"0.0.0.0\", que indica o uso do endereço IP da "
 "interface."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "Multicast IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
@@ -401,25 +414,25 @@ msgstr ""
 "Endereço de multicast IPv6. O padrão é \"FF02::6D\", o multicast do enlace "
 "local do roteador MANET."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "A rede IPv6 deve ser informada em notação completa. O prefixo deve ser em "
 "notação CIDR."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "Origem IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -429,13 +442,13 @@ msgstr ""
 "com o prefixo do parâmetro. O padrão é \"0::/0\", que faz com que seja usado "
 "um endereço IP não local da interface."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "Prefixo IPv6 do enlace superior (uplink)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -449,24 +462,26 @@ msgstr ""
 "1.0 se alterado..<br /><b>CUIDADO:</b> Este parâmetro não deve ser usado em "
 "conjunto com a métrica etx_ffeth!<br />O padrão é \"1.0\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr "Se este Nó usa NAT para conexões com a internet. Padrão é \"sim\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interface"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -477,15 +492,15 @@ msgstr ""
 "\"ether\". O padrão é \"mesh\"."
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Padrões da Interface"
 
@@ -493,8 +508,8 @@ msgstr "Padrões da Interface"
 msgid "Internet protocol"
 msgstr "Protocolo internet"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
@@ -503,18 +518,18 @@ msgstr ""
 "configurações (em segundos). O padrão é \"2.5\"."
 
 # 20140621: edersg: tradução
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr "Valor inválido para LQMult-Value. Deve estar entre 0.01 e 1.0."
 
 # 20140621: edersg: tradução
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
@@ -522,7 +537,7 @@ msgstr ""
 "Valor inválido para LQMult-Value. Você deve utilizar aqui um número decimal "
 "entre 0.01 e 1.0."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Rotas OLSR conhecidas"
 
@@ -530,32 +545,32 @@ msgstr "Rotas OLSR conhecidas"
 msgid "LQ"
 msgstr "<abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 "Envelhecimento do <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "Algoritmo <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "Fisheye <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "Nível <abbr title=\"Link Quality, Qualidade do Enlace\">LQ</abbr>"
 
 # 20140621: edersg: tradução
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -571,20 +586,20 @@ msgstr "Último salto"
 msgid "Legend"
 msgstr "Legenda"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Biblioteca"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "Configurações da Qualidade do Enlace"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -595,8 +610,8 @@ msgstr ""
 "para etx_float e etx_fpm, Valores menores significam mudanças mais lentas do "
 "valor ETX. (permitido valores entre 0.01 e 1.0)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -613,8 +628,8 @@ msgstr ""
 "para o cálculo do ETX<br /><b>etx_ffeth</b>: variação incompatível do etx_ff "
 "que permite enlaces ethernet com ETX 0.1.<br />O padrão é \"etx_ff\""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -625,10 +640,10 @@ msgstr ""
 "b> = não use a qualidade do enlace<br /><b>2</b> = use a qualidade do enlace "
 "para a seleção do MPR e roteamento<br />O padrão é \"2\""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "Multiplicador da Qualidade do Enlace"
 
@@ -640,42 +655,43 @@ msgstr "Enlaces por nó (média)"
 msgid "Links total"
 msgstr "Total de enlaces"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "Endereço IP da interface local"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 "<abbr title=\"Multiple interface declaration,Declaração de interface múltipla"
 "\">MID</abbr>"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 "Intervalo do <abbr title=\"Multiple interface declaration,Declaração de "
 "interface múltipla\">MID</abbr>"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 "Validade do <abbr title=\"Multiple interface declaration,Declaração de "
 "interface múltipla\">MID</abbr>"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "IP Principal"
 
@@ -689,22 +705,23 @@ msgstr ""
 "OLSRd esteja rodando e configurado na porta 9090 aceitando conexões a partir "
 "de \"127.0.0.1\"."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "Métrica"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Modo"
 
 # 20140621: edersg: tradução
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -730,8 +747,8 @@ msgstr ""
 "Exemplos: <br />reduzir LQ para 192.168.0.1 pela metade: 192.168.0.1 0.5<br /"
 "> reduzir LQ para todos os nós nesta interface em 20%: padrão 0.8"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "Limiar do NAT"
 
@@ -745,7 +762,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Vizinhos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "Endereço IP do Vizinho"
 
@@ -754,26 +772,26 @@ msgid "Neighbours"
 msgstr "Vizinhos"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Máscara de rede"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Rede"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Endereço de rede"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "Intervalo de consulta de mudanças na placa de rede"
 
@@ -801,30 +819,32 @@ msgstr ""
 "OLSR - Anúncios <abbr title=\"Host and network association, Associação de "
 "equipamentos e redes\">HNA</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "Servidor OLSR"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "Servidor OLSR - Interface"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "Conexões do OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "Roteador OLSR"
 
@@ -843,11 +863,11 @@ msgstr "Laranja"
 msgid "Overview"
 msgstr "Visão Geral"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Visão geral os anúncios de rede de equipamentos OLSR atualmente ativos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Visão geral das conexões OLSR atualmente estabelecidas"
 
@@ -855,7 +875,7 @@ msgstr "Visão geral das conexões OLSR atualmente estabelecidas"
 msgid "Overview of currently known OLSR nodes"
 msgstr "Visão geral dos nós OLSR conhecidos atualmente"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Visão geral das rotas conhecidas atualmente para outros nós OLSR"
 
@@ -867,41 +887,42 @@ msgstr "Visão geral das interfaces onde o OLSR está rodando"
 msgid "Overview of known multiple interface announcements"
 msgstr "Visão geral de anúncios de nós com múltiplas interfaces conhecidas"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "Visão geral dos SmartGateways na rede"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Configuração do Plugin"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Plugins"
 
 # Que socket?
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "Taxa de consulta por conexões OLSR, em segundos. Padrão é 0.05."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "Taxa de consulta"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefixo"
 
@@ -934,7 +955,8 @@ msgstr "Rotas"
 msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundárias"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -974,25 +996,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr "Relação do ruído do sinal em dB"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "Anúncios do SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "SmartGateway não está configurado no seu sistema."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "Endereço de origem"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -1001,12 +1023,12 @@ msgstr ""
 "primeiro parâmetro é a taxa de envio (upstream) e o segundo parâmetro é a "
 "taxa de recebimento (downstream). O padrão é \"128 1024\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "Velocidade do enlace superior"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Estado"
 
@@ -1028,37 +1050,37 @@ msgstr "Taxa de sucesso de pacotes recebidos de vizinhos"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "Taxa de sucesso de pacotes enviados a vizinhos"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "<abbr title=\"Topology Control, Controle de Topologia\">TC</abbr>"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 "Intervalo do <abbr title=\"Topology Control, Controle de Topologia\">TC</"
 "abbr>"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 "Validade do <abbr title=\"Topology Control, Controle de Topologia\">TC</abbr>"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "Valor do TOS"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -1072,8 +1094,8 @@ msgstr ""
 "suporte o modo ad-hoc e, é claro, em qualquer dispositivo ethernet. Visite "
 "<a href='http://www.olsr.org'>olsrd.org</a> para ajuda e documentação."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -1082,13 +1104,13 @@ msgstr ""
 "definida, ela será dinamicamente calculada baseada no estado da energia/"
 "bateria, O padrão é \"3\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "A interface onde o OLSRd deve servir."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -1096,8 +1118,8 @@ msgstr ""
 "A porta que o OLSR usa. Isto geralmente deve ficar na porta 698, designada "
 "pela IANA. Pode ter qualquer valor entre 1 e 65535."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1109,10 +1131,10 @@ msgstr ""
 "IPv6 local para usar o roteador IPv6 sem qualquer tradução de endereços. O "
 "tamanho máximo do prefixo é 64 bits. O padrão é \"::/0\" (nenhum prefixo)."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "Temporização e Validade"
 
@@ -1120,8 +1142,8 @@ msgstr "Temporização e Validade"
 msgid "Topology"
 msgstr "Topologia"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1133,22 +1155,24 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Não foi possível conectar ao servidor OLSR!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "Enlace superior (uplink)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "Enlace superior (uplink) usa NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Usar retardo"
 
 # 20140621: edersg: tradução
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr "Tempo de validade"
 
@@ -1166,12 +1190,12 @@ msgstr "Muito bom (ETX < 2)"
 msgid "Very good (SNR > 30)"
 msgstr "Muito bom (SNR > 30)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "Rede sem fio (WLAN)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1179,17 +1203,17 @@ msgstr ""
 "Atenção: o kmod-ipip não está instalado. Sem o kmod-ipip, o SmartGateway não "
 "irá funcionar. Por favor, instale-o."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Peso"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1230,8 +1254,8 @@ msgstr ""
 "and network association, Associação de equipamentos e redes\">HNA</abbr> "
 "local de 0.0.0.0/0, ::ffff:0:0/96 ou 2000::/3. O padrão é \"ambos\"."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Disponibilidade"
 
@@ -1240,40 +1264,42 @@ msgstr "Disponibilidade"
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "Não"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "Sim"
 
 #~ msgid "Status"
 #~ msgstr "Estado"
 
-#~ msgid "Device"
-#~ msgstr "Dispositivo"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/applications/luci-app-olsr/po/pt/olsr.po b/applications/luci-app-olsr/po/pt/olsr.po
index cf61f436f..4a6cf490f 100644
--- a/applications/luci-app-olsr/po/pt/olsr.po
+++ b/applications/luci-app-olsr/po/pt/olsr.po
@@ -21,33 +21,35 @@ msgstr "Anuncios MID ativos"
 msgid "Active OLSR nodes"
 msgstr "Nós OLSR ativos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 #, fuzzy
 msgid "Active host net announcements"
 msgstr "Anuncios activos de hosts"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Definições Avançadas"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Permitir gateways com NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "Permitir a selecção de uma gateway IPv4 para saída com NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Anunciar uplink"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Rede anunciada"
 
@@ -63,12 +65,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr "Os valores tem de usar a dotação decimal."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Endereço de broadcast"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -87,11 +89,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "Dispositivo"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Mostrar"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -99,24 +106,25 @@ msgstr ""
 msgid "Download Config"
 msgstr "Descarregar Configuração"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Ativar"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -124,13 +132,13 @@ msgstr ""
 "Ativar SmartGateway. Se estiver desativado, então todos os outros parâmetros "
 "SmartGateway são ignorados. Por defeito é \"não\""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Ativar esta interface."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Ativado"
 
@@ -138,13 +146,13 @@ msgstr "Ativado"
 msgid "Expected retransmission count"
 msgstr "Contagem de retransmissões esperada"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "métrica FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -154,26 +162,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Definições gerais"
 
@@ -191,8 +200,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -201,17 +210,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Intervalo entre HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Validade de HNA"
 
@@ -220,22 +229,22 @@ msgstr "Validade de HNA"
 msgid "HNA6 Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Intervalo entre Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Validade de Hello"
 
@@ -253,16 +262,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -278,18 +289,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Endereços IP"
 
@@ -299,87 +310,89 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "Endereço IPv4 de Broadcast"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "Multicast IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "A rede IPv6 deve ser fornecido em dotação completa, o prefixo deve estar na "
 "notação CIDR."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "Origem IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -388,24 +401,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interface"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -416,15 +431,15 @@ msgstr ""
 "são \"mesh\" e \"ether\". Por defeito é \"mesh\"."
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Interfaces"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Predefinições das Interfaces"
 
@@ -432,30 +447,30 @@ msgstr "Predefinições das Interfaces"
 msgid "Internet protocol"
 msgstr "Protocolo de Internet"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Rotas OLSR conhecidas"
 
@@ -463,31 +478,31 @@ msgstr "Rotas OLSR conhecidas"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "Envelhecimento LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "Algoritmo LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #, fuzzy
 msgid "LQ fisheye"
 msgstr "LQ Fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "Nível LQ"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -501,28 +516,28 @@ msgstr "Ultimo salto"
 msgid "Legend"
 msgstr "Legenda"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Biblioteca"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "Definições de Qualidade do Link"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -532,18 +547,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -555,36 +570,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "Endereço IP do interface local"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "Intervalo de MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "Validade de MID"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "IP Principal"
 
@@ -594,21 +610,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "Métrica"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Modo"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -625,8 +642,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -638,7 +655,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Vizinhos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "Endereço IP do Vizinho"
 
@@ -647,26 +665,26 @@ msgid "Neighbours"
 msgstr "Vizinhos"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Máscara de rede"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Rede"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Endereço de rede"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -691,30 +709,32 @@ msgstr "OLSR - Anuncios HNA4"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - Anuncios HNA4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "Servidor OLSR"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR - Ligações"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "Gateway OLSR"
 
@@ -732,12 +752,12 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 #, fuzzy
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Resumo de anuncios activos de hosts"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Resumo das ligações OLSR actualmente estabelecidas"
 
@@ -745,7 +765,7 @@ msgstr "Resumo das ligações OLSR actualmente estabelecidas"
 msgid "Overview of currently known OLSR nodes"
 msgstr "Resumo dos nós OLSR conhecidos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Resumo das rotas conhecidas para outros nós OLSR"
 
@@ -757,40 +777,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr "Resumo de anuncios de nós com multiplos interfaces activos"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Configuração de Plugin"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "Pollrate"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Porta"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefixo"
 
@@ -818,7 +839,8 @@ msgstr "Rotas"
 msgid "Secondary OLSR interfaces"
 msgstr "Interfaces OLSR secundários"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -849,36 +871,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "Endereço de origem"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "Velocidade do uplink"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Estado"
 
@@ -898,34 +920,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "Intervalo de TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Validade de TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -934,27 +956,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -962,10 +984,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -973,8 +995,8 @@ msgstr ""
 msgid "Topology"
 msgstr "Topologia"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -984,21 +1006,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Não foi possivel ligar ao servidor OLSR!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "O uplink usa NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Usar histerese"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1014,28 +1038,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1060,8 +1084,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Disponibilidade"
 
@@ -1070,40 +1094,42 @@ msgstr "Disponibilidade"
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
 
 #~ msgid "Status"
 #~ msgstr "Estado"
 
-#~ msgid "Device"
-#~ msgstr "Dispositivo"
-
 #~ msgid ""
 #~ "Make sure that OLSRd is running, the \"txtinfo\" plugin is loaded, "
 #~ "configured on port 2006 and accepts connections from \"127.0.0.1\"."
diff --git a/applications/luci-app-olsr/po/ro/olsr.po b/applications/luci-app-olsr/po/ro/olsr.po
index 71e278de9..8c28bb261 100644
--- a/applications/luci-app-olsr/po/ro/olsr.po
+++ b/applications/luci-app-olsr/po/ro/olsr.po
@@ -20,32 +20,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Setări avansate"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -61,12 +63,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -85,11 +87,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -97,36 +104,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Activare"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Activează această interfaţă"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Activat"
 
@@ -134,13 +142,13 @@ msgstr "Activat"
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -150,26 +158,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Setări generale"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Setări generale"
 
@@ -187,8 +196,8 @@ msgid "Green"
 msgstr "Verde"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -197,17 +206,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -215,22 +224,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -248,16 +257,18 @@ msgstr "Ascunde IPv6"
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Nume domeniu"
 
@@ -273,18 +284,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "Adrese IP"
 
@@ -294,85 +305,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -381,24 +394,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Interfaţă"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -406,15 +421,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Interfeţe"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Interfeţe implicite"
 
@@ -422,30 +437,30 @@ msgstr "Interfeţe implicite"
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -453,30 +468,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "Algoritm LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "Nivel LQ"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -490,28 +505,28 @@ msgstr ""
 msgid "Legend"
 msgstr "Legendă"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -521,18 +536,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -544,36 +559,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -583,21 +599,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -614,8 +631,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -627,7 +644,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Vecini"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "IP vecin"
 
@@ -636,26 +654,26 @@ msgid "Neighbours"
 msgstr "Vecini"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -679,30 +697,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -720,11 +740,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -732,7 +752,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -744,40 +764,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Pluginuri"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -805,7 +826,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -836,36 +858,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr "Raport zgomot semnal în dB"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -885,34 +907,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -921,27 +943,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -949,10 +971,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -960,8 +982,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -971,21 +993,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1001,28 +1025,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Greutate"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1047,8 +1071,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1057,31 +1081,36 @@ msgstr ""
 msgid "Yellow"
 msgstr "Galben"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "nu"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "da"
 
diff --git a/applications/luci-app-olsr/po/ru/olsr.po b/applications/luci-app-olsr/po/ru/olsr.po
index 0220e04d8..6c1799894 100644
--- a/applications/luci-app-olsr/po/ru/olsr.po
+++ b/applications/luci-app-olsr/po/ru/olsr.po
@@ -23,32 +23,34 @@ msgstr "Активные объявления MID"
 msgid "Active OLSR nodes"
 msgstr "Активные OLSR узлы"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Активные объявления хост-сети (HNA)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "Разрешить шлюзы с NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "Разрешить выбор исходящего IPv4 шлюза с NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Объявить внешнее соединение"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Объявить сеть"
 
@@ -66,12 +68,12 @@ msgstr ""
 "Оба значения должны быть в десятичном представлении с разделительными "
 "точками."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Широковещательный адрес"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr "Допускается только IPv4 или IPv6 адрес или 'по умолчанию'"
 
@@ -92,11 +94,16 @@ msgstr ""
 "Не удалось получить данные. Убедитесь, что плагин 'jsoninfo' установлен и "
 "разрешает соединения с localhost."
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Показать состояние"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Внутреннее соединение"
 
@@ -104,24 +111,25 @@ msgstr "Внутреннее соединение"
 msgid "Download Config"
 msgstr "Загрузить config файл"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Включить"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -129,13 +137,13 @@ msgstr ""
 "Включить SmartGW (смарт-шлюз).<br />Если выключено, все остальные параметры "
 "SmartGW игнорируются. По умолчанию 'нет'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Использовать этот интерфейс."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Включено"
 
@@ -143,13 +151,13 @@ msgstr "Включено"
 msgid "Expected retransmission count"
 msgstr "Ожидаемое количество повторных передач"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "Метрика FIB"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -166,27 +174,28 @@ msgstr ""
 "происходит только при изменении следующего перехода.<br />По умолчанию "
 "используется 'flat'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 "Механизм 'fisheye' для TC-ов (средство проверки). По умолчанию 'включено'."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Шлюз"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Основные настройки"
 
@@ -204,8 +213,8 @@ msgid "Green"
 msgstr "Зеленый"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -214,17 +223,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "Объявления HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Интервал HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Время действия HNA"
 
@@ -232,22 +241,22 @@ msgstr "Время действия HNA"
 msgid "HNA6 Announcements"
 msgstr "Объявления HNA6"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Приветствие"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Интервал приветствия"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Время действия приветствия"
 
@@ -265,16 +274,18 @@ msgstr "Скрыть IPv6"
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "Переходы"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Имя хоста"
 
@@ -294,8 +305,8 @@ msgstr ""
 "Хосты в маршрутизируемой сети OLSR могут извещать о подключении к внешним "
 "сетям с помощью сообщений HNA6."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -305,10 +316,10 @@ msgstr ""
 "переходов). Гистерезис увеличивает надёжность канала, но вносит задержку в "
 "регистрацию соседних устройств. По умолчанию 'да'."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IP-Адреса"
 
@@ -320,17 +331,18 @@ msgstr ""
 "IP версия для использования. Если выбран 6and4, то для каждого протокола "
 "запускается один экземпляр olsrd."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "Широковещательный<br />IPv4-адрес"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -340,13 +352,13 @@ msgstr ""
 "255.255.255.255. По умолчанию используется значение \"0.0.0.0\", которое "
 "запускает использование широковещательного IP-адреса интерфейса."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 источник"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
@@ -354,21 +366,22 @@ msgstr ""
 "IPv4-адрес отправителя для исходящих OLSR пакетов. По умолчанию используется "
 "значение \"0.0.0.0\", которое запускает использование интерфейса IP."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 мультивещание"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
@@ -376,25 +389,25 @@ msgstr ""
 "IPv6-адрес мультивещания. По умолчанию 'FF02::6D', MANET маршрутизатор "
 "локальной сети мультивещания."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 "IPv6 сеть должна быть указана в полной нотации, префикс должен быть в "
 "нотации CIDR."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 источник"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -405,13 +418,13 @@ msgstr ""
 "'0::/0', которое запускает использование IP интерфейса не локального "
 "соединения."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "IPv6 Префикс внешнего соединения"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -425,25 +438,27 @@ msgstr ""
 "изменении должно быть ближе к '1.0'.<br /><b>Внимание:</b> Не используйте "
 "данный параметр вместе с метрикой etx_ffeth!<br />По умолчанию '1.0'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 "Использует ли данный узел NAT для подключения к Интернету. По умолчанию 'да'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Интерфейс"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -454,15 +469,15 @@ msgstr ""
 "'ether'. По умолчанию 'mesh'."
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Интерфейсы"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Значения по умолчанию для интерфейсов"
 
@@ -470,8 +485,8 @@ msgstr "Значения по умолчанию для интерфейсов"
 msgid "Internet protocol"
 msgstr "Интернет протокол"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
@@ -479,18 +494,18 @@ msgstr ""
 "Интервал опроса сетевых интерфейсов на наличие изменений в config файле "
 "(сек.). По умолчанию '2.5'."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 "Недопустимое значение для LQMult-Value. Должно быть между '0,01' и '1,0'."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
@@ -498,7 +513,7 @@ msgstr ""
 "Недопустимое значение для LQMult-Value. Вы должны использовать десятичное "
 "число между '0,01' и '1,0'."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Известные маршруты OLSR"
 
@@ -506,30 +521,30 @@ msgstr "Известные маршруты OLSR"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ старение"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ алгоритм"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ частота"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -545,20 +560,20 @@ msgstr "Последний переход"
 msgid "Legend"
 msgstr "События"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Библиотека"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "Настройки качества соединений (LQ)"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -568,8 +583,8 @@ msgstr ""
 "подстройки для etx_float и etx_fpm.<br />Чем меньше значение, тем меньше "
 "изменения значения ETX.<br />Диапазон допустимых значений от '0.0' до '1.0'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -585,8 +600,8 @@ msgstr ""
 "b>: несовместимый вариант etx_ff, разрешающий Ethernet-соединения с ETX 0.1."
 "<br />По умолчанию 'etx_ff'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -596,10 +611,10 @@ msgstr ""
 "><b>0</b> = не использовать LQ<br /><b>2</b> = использовать LQ для выбора "
 "MPR и маршрутизации<br />По умолчанию '2'."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "Мультипликатор качества соединения (LQ)"
 
@@ -611,36 +626,37 @@ msgstr "Кол-во соединений на узел (среднее)"
 msgid "Links total"
 msgstr "Общее кол-во соединений"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP-адрес локального интерфейса"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "Интервал MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "Время действия MID"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "Основной IP-адрес"
 
@@ -652,21 +668,22 @@ msgstr ""
 "Удостоверьтесь, что демон OLSRd работает, плагин 'txtinfo' загружен, "
 "настроен на порт 9090 и принимает соединения от '127.0.0.1'."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "Метрика"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Режим"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -692,8 +709,8 @@ msgstr ""
 "fd91:662e:3c58::1 '0.5'.<br />уменьшить LQ для всех узлов на данном "
 "интерфейсе на 20%: default '0.8'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "Порог NAT"
 
@@ -705,7 +722,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "Соседние узлы"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "Соседние IP-адреса"
 
@@ -714,26 +732,26 @@ msgid "Neighbours"
 msgstr "Соседние узлы"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Маска сети"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Сеть"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Сетевой адрес"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "Сетевой адаптер изменяет интервал опроса"
 
@@ -757,30 +775,32 @@ msgstr "OLSR - HNA-объявления"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA6-объявления"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Плагины"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR демон"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR демон - Интерфейс"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR соединения"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "OLSR шлюз"
 
@@ -798,11 +818,11 @@ msgstr "Оранжевый"
 msgid "Overview"
 msgstr "Главное меню"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Обзор текущих активных OLSR объявлений HNA"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Обзор установленных на данный момент OLSR соединений"
 
@@ -810,7 +830,7 @@ msgstr "Обзор установленных на данный момент OLS
 msgid "Overview of currently known OLSR nodes"
 msgstr "Обзор известных на данный момент узлов OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Обзор известных на данный момент маршрутов к другим OLSR узлам"
 
@@ -822,40 +842,41 @@ msgstr "Обзор интерфейсов с запущенным OLSR"
 msgid "Overview of known multiple interface announcements"
 msgstr "Обзор известных объявлений с несколькими интерфейсами"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "Обзор смарт шлюзов в этой сети"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Настройка плагинов"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Плагины"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "Частота опроса для сокетов OLSR в секундах. По умолчанию '0,05'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "Частота опроса"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Порт"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Префикс"
 
@@ -887,7 +908,8 @@ msgstr "Маршруты"
 msgid "Secondary OLSR interfaces"
 msgstr "Вторичные OLSR интерфейсы"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -925,25 +947,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr "Коэффициент шума сигнала в дБ"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "SmartGW объявления"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "SmartGW (смарт-шлюз) не настроен на этой системе."
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "Адрес источника"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -952,12 +974,12 @@ msgstr ""
 "внешняя сеть, второй параметр - внутренняя сеть. Значение по умолчанию '128 "
 "1024'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "Скорость внешнего соединения"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Указывать"
 
@@ -978,34 +1000,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr "Показатель успешности прохождения пакетов, отправляемых соседнему узлу"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "Интервал TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Время действия TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "Значение TOS"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -1019,8 +1041,8 @@ msgstr ""
 "Ethernet с поддержкой режима ad-hoc.<br />Более подробную информацию можно "
 "найти на <a href='http://www.olsr.org'>olsrd.org</a>."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -1029,13 +1051,13 @@ msgstr ""
 "рассчитываться динамически на основе состояния батареи/питания. По умолчанию "
 "'3'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "Интерфейс, обслуживаемый OLSRd."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -1043,8 +1065,8 @@ msgstr ""
 "Порт, используемый для OLSR. Рекомендуется использовать присвоенный IANA "
 "порт 698.<br />Допустимо любое значение в диапазоне от 1 до 65535."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1056,10 +1078,10 @@ msgstr ""
 "для использования IPv6-шлюза без какой-либо трансляции адресов. Максимальная "
 "длина префикса - 64 бита. По умолчанию '::/0' (без префикса)."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "Время и срок действия"
 
@@ -1067,8 +1089,8 @@ msgstr "Время и срок действия"
 msgid "Topology"
 msgstr "Топология"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1080,21 +1102,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Не удалось подключиться к демону OLSR!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "Внешнее соединение"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "Внешнее соединение использует NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Использовать гистерезис"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr "Время действия"
 
@@ -1110,12 +1134,12 @@ msgstr "Очень хорошо (ETX < 2)"
 msgid "Very good (SNR > 30)"
 msgstr "Очень хорошо (SNR > 30)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1123,17 +1147,17 @@ msgstr ""
 "<b>Внимание:</b> 'kmod-ipip' не установлен. Без пакета модуля ядра kmod-"
 "ipip, SmartGW (смарт-шлюз) не будет работать, установите его."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Вес"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1171,8 +1195,8 @@ msgstr ""
 "Определение внешнего соединения происходит при наличии в локальном HNA6 ::"
 "ffff:0:0/96 или 2000::/3. Значение по умолчанию 'оба'."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Готовность"
 
@@ -1181,31 +1205,36 @@ msgstr "Готовность"
 msgid "Yellow"
 msgstr "Желтый"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "нет"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "да"
 
diff --git a/applications/luci-app-olsr/po/sk/olsr.po b/applications/luci-app-olsr/po/sk/olsr.po
index ca7832244..74df7ec6d 100644
--- a/applications/luci-app-olsr/po/sk/olsr.po
+++ b/applications/luci-app-olsr/po/sk/olsr.po
@@ -16,32 +16,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -57,12 +59,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -81,11 +83,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -93,36 +100,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -130,13 +138,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -146,26 +154,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -183,8 +192,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -193,17 +202,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -211,22 +220,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -244,16 +253,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -269,18 +280,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -290,85 +301,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -377,24 +390,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -402,15 +417,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -418,30 +433,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -449,30 +464,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -486,28 +501,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -517,18 +532,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -540,36 +555,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -579,21 +595,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -610,8 +627,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -623,7 +640,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -632,26 +650,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -675,30 +693,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -716,11 +736,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -728,7 +748,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -740,40 +760,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -801,7 +822,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -832,36 +854,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -881,34 +903,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -917,27 +939,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -945,10 +967,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -956,8 +978,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -967,21 +989,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -997,28 +1021,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1043,8 +1067,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1053,30 +1077,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/sv/olsr.po b/applications/luci-app-olsr/po/sv/olsr.po
index d313a448c..1ee56ec34 100644
--- a/applications/luci-app-olsr/po/sv/olsr.po
+++ b/applications/luci-app-olsr/po/sv/olsr.po
@@ -17,32 +17,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr "Aktiva OLSR-noder"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "Avancerade inställningar"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "Tillkännage upplänk"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Tillkännagivet nätverk"
 
@@ -58,12 +60,12 @@ msgstr "Dålig (SNR < 5)"
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "Sändningsadress"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr "Kan endast vara en giltig IPv4 eller IPv6-adress eller 'standard'"
 
@@ -84,11 +86,16 @@ msgstr ""
 "Kunde inte ta emot någon data. Försäkra dig om att insticksprogrammet "
 "jsoninfo är installerat och tillåter anslutningar från localhost"
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "Visa"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "Nerlänk"
 
@@ -96,36 +103,37 @@ msgstr "Nerlänk"
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "Aktivera"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "Aktivera det här gränssnittet."
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "Aktivera"
 
@@ -133,13 +141,13 @@ msgstr "Aktivera"
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -149,26 +157,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "Gateway"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "Generella inställningar"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Generella inställningar"
 
@@ -186,8 +195,8 @@ msgid "Green"
 msgstr "Grön"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -196,17 +205,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Giltighetstid för HNA"
 
@@ -214,22 +223,22 @@ msgstr "Giltighetstid för HNA"
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Hallå"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Hallå-intervall"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Giltighetstid för Hallå"
 
@@ -247,16 +256,18 @@ msgstr "Göm IPv6"
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "Värdnamn"
 
@@ -272,18 +283,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IP-adresser"
 
@@ -293,85 +304,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4-källa"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6-källa"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -380,24 +393,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "Gränssnitt"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -405,15 +420,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "Gränssnitten"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "Standard-gränssnitten"
 
@@ -421,30 +436,30 @@ msgstr "Standard-gränssnitten"
 msgid "Internet protocol"
 msgstr "Internet-protokoll"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Kända OLSR-rutter"
 
@@ -452,30 +467,30 @@ msgstr "Kända OLSR-rutter"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ-algoritm"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ-nivå"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -489,28 +504,28 @@ msgstr "Senaste hopp"
 msgid "Legend"
 msgstr "Legend"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Bibliotek"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "Inställningar för länkkvalité"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -520,18 +535,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -543,36 +558,37 @@ msgstr "Länker per nod (vanlig)"
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "IP-adress för lokalt gränssnitt"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "MID-intervall"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "Huvudsaklig IP-adress"
 
@@ -582,21 +598,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "Metrisk"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "Läge"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -613,8 +630,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -626,7 +643,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "Grannar"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -635,26 +653,26 @@ msgid "Neighbours"
 msgstr "Grannar"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Nätmask"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "Nätverk"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "Nätverksadress"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -678,30 +696,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Insticksprogram"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR-demon"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR-demon - Gränssnitt"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR-anslutningar"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -719,11 +739,11 @@ msgstr "Orange"
 msgid "Overview"
 msgstr "Överblick"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -731,7 +751,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -743,40 +763,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Konfiguration av insticksprogram"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "Insticksprogram"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "Port"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Prefix"
 
@@ -804,7 +825,8 @@ msgstr "Rutter"
 msgid "Secondary OLSR interfaces"
 msgstr "Andra OLSR-gränssnitt"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -835,36 +857,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "Adress för källkod"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "Skick"
 
@@ -884,34 +906,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "TC-intervall"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Giltighetstid för TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS-värde"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -920,27 +942,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -948,10 +970,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -959,8 +981,8 @@ msgstr ""
 msgid "Topology"
 msgstr "Topologi"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -970,21 +992,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Kunde inte ansluta till OLSR-demonen!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "Upplänk"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "Upplänken använder NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr "Giltighetstid"
 
@@ -1000,12 +1024,12 @@ msgstr "Jättebra (ETX < 2)"
 msgid "Very good (SNR > 30)"
 msgstr "Jättebra (SNR > 30)"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1013,17 +1037,17 @@ msgstr ""
 "Varning: kmod-ipip är inte installerat. SmartGateway kommer inte att "
 "fungerautan kmod-ipip, vänligen installera det."
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "Vikt"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1048,8 +1072,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Frivillighet"
 
@@ -1058,31 +1082,36 @@ msgstr "Frivillighet"
 msgid "Yellow"
 msgstr "Gul"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "nej"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "ja"
 
diff --git a/applications/luci-app-olsr/po/templates/olsr.pot b/applications/luci-app-olsr/po/templates/olsr.pot
index 521af613e..91b583065 100644
--- a/applications/luci-app-olsr/po/templates/olsr.pot
+++ b/applications/luci-app-olsr/po/templates/olsr.pot
@@ -9,32 +9,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -50,12 +52,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -74,11 +76,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -86,36 +93,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -123,13 +131,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -139,26 +147,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -176,8 +185,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -186,17 +195,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -204,22 +213,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -237,16 +246,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -262,18 +273,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -283,85 +294,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -370,24 +383,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -395,15 +410,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -411,30 +426,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -442,30 +457,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -479,28 +494,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -510,18 +525,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -533,36 +548,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -572,21 +588,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -603,8 +620,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -616,7 +633,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -625,26 +643,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -668,30 +686,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -709,11 +729,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -721,7 +741,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -733,40 +753,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -794,7 +815,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -825,36 +847,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -874,34 +896,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -910,27 +932,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -938,10 +960,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -949,8 +971,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -960,21 +982,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -990,28 +1014,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1036,8 +1060,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1046,35 +1070,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
-
-#: application/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
-msgid "Selected"
-msgstr ""
-
diff --git a/applications/luci-app-olsr/po/tr/olsr.po b/applications/luci-app-olsr/po/tr/olsr.po
index 37a72ea8a..3385fa654 100644
--- a/applications/luci-app-olsr/po/tr/olsr.po
+++ b/applications/luci-app-olsr/po/tr/olsr.po
@@ -16,32 +16,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -57,12 +59,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -81,11 +83,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -93,36 +100,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -130,13 +138,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -146,26 +154,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -183,8 +192,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -193,17 +202,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -211,22 +220,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -244,16 +253,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -269,18 +280,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -290,85 +301,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -377,24 +390,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -402,15 +417,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -418,30 +433,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -449,30 +464,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -486,28 +501,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -517,18 +532,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -540,36 +555,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -579,21 +595,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -610,8 +627,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -623,7 +640,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -632,26 +650,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -675,30 +693,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -716,11 +736,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -728,7 +748,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -740,40 +760,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -801,7 +822,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -832,36 +854,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -881,34 +903,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -917,27 +939,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -945,10 +967,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -956,8 +978,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -967,21 +989,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -997,28 +1021,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1043,8 +1067,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1053,30 +1077,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/uk/olsr.po b/applications/luci-app-olsr/po/uk/olsr.po
index 47bcea4f0..9d6e8b1db 100644
--- a/applications/luci-app-olsr/po/uk/olsr.po
+++ b/applications/luci-app-olsr/po/uk/olsr.po
@@ -17,32 +17,34 @@ msgstr ""
 msgid "Active OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr ""
 
@@ -58,12 +60,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -82,11 +84,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -94,36 +101,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -131,13 +139,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -147,26 +155,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr ""
 
@@ -184,8 +193,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -194,17 +203,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr ""
 
@@ -212,22 +221,22 @@ msgstr ""
 msgid "HNA6 Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr ""
 
@@ -245,16 +254,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -270,18 +281,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -291,85 +302,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -378,24 +391,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -403,15 +418,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -419,30 +434,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr ""
 
@@ -450,30 +465,30 @@ msgstr ""
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -487,28 +502,28 @@ msgstr ""
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -518,18 +533,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -541,36 +556,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -580,21 +596,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -611,8 +628,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -624,7 +641,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr ""
 
@@ -633,26 +651,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -676,30 +694,32 @@ msgstr ""
 msgid "OLSR - HNA6-Announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr ""
 
@@ -717,11 +737,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr ""
 
@@ -729,7 +749,7 @@ msgstr ""
 msgid "Overview of currently known OLSR nodes"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr ""
 
@@ -741,40 +761,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr ""
 
@@ -802,7 +823,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -833,36 +855,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -882,34 +904,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -918,27 +940,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -946,10 +968,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -957,8 +979,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -968,21 +990,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -998,28 +1022,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1044,8 +1068,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr ""
 
@@ -1054,30 +1078,35 @@ msgstr ""
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
diff --git a/applications/luci-app-olsr/po/vi/olsr.po b/applications/luci-app-olsr/po/vi/olsr.po
index 7989c7344..ae73fafc6 100644
--- a/applications/luci-app-olsr/po/vi/olsr.po
+++ b/applications/luci-app-olsr/po/vi/olsr.po
@@ -22,32 +22,34 @@ msgstr "Thông báo của các MID đang hoạt động"
 msgid "Active OLSR nodes"
 msgstr "Những OLSR nodes đang hoạt động"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "Thông báo của mạng host đang hoạt động"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "Mạng lưới thông báo"
 
@@ -63,12 +65,12 @@ msgstr ""
 msgid "Both values must use the dotted decimal notation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
@@ -87,11 +89,16 @@ msgid ""
 "allows connections from localhost."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr ""
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr ""
 
@@ -99,36 +106,37 @@ msgstr ""
 msgid "Download Config"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr ""
 
@@ -136,13 +144,13 @@ msgstr ""
 msgid "Expected retransmission count"
 msgstr "Expected retransmission count"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "FIB metric"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -152,26 +160,27 @@ msgid ""
 "Default is \"flat\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "Cài đặt tổng quát"
 
@@ -189,8 +198,8 @@ msgid "Green"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr ""
@@ -199,17 +208,17 @@ msgstr ""
 msgid "HNA Announcements"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "Khoảng HNA"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "Thời gian hợp lệ hóa HNA "
 
@@ -218,22 +227,22 @@ msgstr "Thời gian hợp lệ hóa HNA "
 msgid "HNA6 Announcements"
 msgstr "OLSR - HNA - Thông báo"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Vùng xin chào"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Thời gian hợp lệ hóa lời chào"
 
@@ -251,16 +260,18 @@ msgstr ""
 msgid "Hna4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr ""
 
@@ -276,18 +287,18 @@ msgid ""
 "networks using HNA6 messages."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr ""
 
@@ -297,85 +308,87 @@ msgid ""
 "for each protocol."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
 "interface broadcast IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
 "of a not-linklocal interface IP."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -384,24 +397,26 @@ msgid ""
 "with the etx_ffeth metric!<br />Defaults to \"1.0\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -409,15 +424,15 @@ msgid ""
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr ""
 
@@ -425,30 +440,30 @@ msgstr ""
 msgid "Internet protocol"
 msgstr "Internet protocol"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "Tuyến OLRS đã biết"
 
@@ -456,30 +471,30 @@ msgstr "Tuyến OLRS đã biết"
 msgid "LQ"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ aging"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ algorithm"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ fisheye"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ level"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -493,28 +508,28 @@ msgstr "Hop cuối "
 msgid "Legend"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "Thư viện "
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
 "(allowed values are between 0.01 and 1.0)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -524,18 +539,18 @@ msgid ""
 "allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
 "quality for MPR selection and routing<br />Default is \"2\""
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr ""
 
@@ -547,36 +562,37 @@ msgstr ""
 msgid "Links total"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "Giao diện địa phương IP"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "Khoảng MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "Thời gian hợp lệ hóa MID"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr ""
 
@@ -586,21 +602,22 @@ msgid ""
 "configured on port 9090 and accepts connections from \"127.0.0.1\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -617,8 +634,8 @@ msgid ""
 "LQ to all nodes on this interface by 20%: default 0.8"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr ""
 
@@ -630,7 +647,8 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "Lận cận IP"
 
@@ -639,26 +657,26 @@ msgid "Neighbours"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "Netmask"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr ""
 
@@ -683,30 +701,32 @@ msgstr "OLSR - HNA - Thông báo"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA - Thông báo"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - Plugins"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR Daemon"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "Kết nối OLSR"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "Cổng OLSR"
 
@@ -724,11 +744,11 @@ msgstr ""
 msgid "Overview"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "Tổng quát về các thông báo của mạng host đang hoạt động"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "Tổng quát về kết nối OLSR hiện tại "
 
@@ -736,7 +756,7 @@ msgstr "Tổng quát về kết nối OLSR hiện tại "
 msgid "Overview of currently known OLSR nodes"
 msgstr "Tổng quát của các OLSR nodes đã biết hiện tại"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "Tổng quát của các tuyến đã biết hiện tại tới những OLSR nodes khác"
 
@@ -748,40 +768,41 @@ msgstr ""
 msgid "Overview of known multiple interface announcements"
 msgstr "Tổng quát về thông báo của nhiều giao diện đã biết"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "Cấu hình Plugin"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "Pollrate"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "Tiền tố"
 
@@ -809,7 +830,8 @@ msgstr ""
 msgid "Secondary OLSR interfaces"
 msgstr "Giao diện OLSR thứ nhì"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -840,36 +862,36 @@ msgid "Signal Noise Ratio in dB"
 msgstr ""
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr ""
 
@@ -889,34 +911,34 @@ msgstr ""
 msgid "Success rate of packages sent to the neighbour"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "Khoảng TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "Thời gian hợp lệ hóa TC"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -925,27 +947,27 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -953,10 +975,10 @@ msgid ""
 "length is 64 bits. Default is \"::/0\" (no prefix)."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr ""
 
@@ -964,8 +986,8 @@ msgstr ""
 msgid "Topology"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -975,21 +997,23 @@ msgstr ""
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "Không thể kết nối với OLSR daemon!"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "Dùng hysteresis"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr ""
 
@@ -1005,28 +1029,28 @@ msgstr ""
 msgid "Very good (SNR > 30)"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr ""
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1051,8 +1075,8 @@ msgid ""
 "setting is \"both\"."
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "Sẵn sàng"
 
@@ -1061,31 +1085,36 @@ msgstr "Sẵn sàng"
 msgid "Yellow"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr ""
 
diff --git a/applications/luci-app-olsr/po/zh-cn/olsr.po b/applications/luci-app-olsr/po/zh-cn/olsr.po
index 615c15842..60e4b3cd6 100644
--- a/applications/luci-app-olsr/po/zh-cn/olsr.po
+++ b/applications/luci-app-olsr/po/zh-cn/olsr.po
@@ -22,32 +22,34 @@ msgstr "活动的 MID 通告"
 msgid "Active OLSR nodes"
 msgstr "活动的 OLSR 节点"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "活动的主机网络通告"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "允许带 NAT 的网关"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "允许选择有 NAT 的 IPv4 网关"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "通告上行链接"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "通告的网络"
 
@@ -63,12 +65,12 @@ msgstr "差（SNR < 5）"
 msgid "Both values must use the dotted decimal notation."
 msgstr "两个值必须使用点分十进制表示法。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "广播地址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr "必须是有效的 IPv4 或 IPv6 地址，或“默认”"
 
@@ -88,11 +90,16 @@ msgid ""
 msgstr ""
 "无法获取任何数据。确保已安装 jsoninfo 插件，并允许来自 localhost 的连接。"
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "设备"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "显示"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "下行链接"
 
@@ -100,24 +107,25 @@ msgstr "下行链接"
 msgid "Download Config"
 msgstr "下载配置"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "启用"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -125,13 +133,13 @@ msgstr ""
 "启用 SmartGateway。如果禁用，则将忽略 SmartGateway 的其他所有参数。缺省"
 "值：“no”"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "启用这个端口"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "已启用"
 
@@ -139,13 +147,13 @@ msgstr "已启用"
 msgid "Expected retransmission count"
 msgstr "预期重发数"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "FIB 度量"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -159,26 +167,27 @@ msgstr ""
 "值。“approx”也使用 hopcount 作为度量值，但只有在下一次更改时才更新 hopcount。"
 "默认为“flat”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr "TC 的鱼眼机制（校验和开启）。默认为“开启”"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "网关"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "一般设置"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "一般设置"
 
@@ -196,8 +205,8 @@ msgid "Green"
 msgstr "绿"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -206,17 +215,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "HNA 通告"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "HNA 间隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "HNA 有效时长"
 
@@ -224,22 +233,22 @@ msgstr "HNA 有效时长"
 msgid "HNA6 Announcements"
 msgstr "HNA 通告"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Hello 间隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Hello 有效时长"
 
@@ -257,16 +266,18 @@ msgstr "隐藏 IPv6"
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "跃点"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "主机名"
 
@@ -282,8 +293,8 @@ msgid ""
 "networks using HNA6 messages."
 msgstr "OLSR 路由网络中的主机可以使用 HNA6 消息通告与外部网络的连接。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -292,10 +303,10 @@ msgstr ""
 "滞后链路检测（仅适用于 hopcount 度量）。滞后增加了链路感测的健壮性，但延迟了"
 "邻居注册过程。默认值为“是”"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IP 地址"
 
@@ -305,17 +316,18 @@ msgid ""
 "for each protocol."
 msgstr "要使用的 IP 版本。如果选择 6and4，则为每个协议启动一个 olsrd 实例。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "IPv4 广播地址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -324,55 +336,56 @@ msgstr ""
 "传出 OLSR 数据包的 IPv4 广播地址。一个有用的例子是 255.255.255.255。默认"
 "为“0.0.0.0”，将触发使用接口的 IP 广播地址。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 源地址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr "传出 OLSR 包的 IPv4 源地址。默认为“0.0.0.0”，将触发使用接口的 IP。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 组播地址"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr "IPv6 组播地址。默认为“FF02::6D”，即 manet-router 链路本地组播地址。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr "IPv6 网络必须完整表出，前缀必须是 CIDR 表示法。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 源地址"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -381,13 +394,13 @@ msgstr ""
 "IPv6 源前缀。OLSRd 将选择一个与此参数前缀匹配的接口 IP。默认为“0::/0”，触发使"
 "用接口的非链路本地 IP。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "IPv6 上行链路前缀"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -399,24 +412,26 @@ msgstr ""
 "乘以该值。参数可以是介于0.1和1.0之间的值，但如果更改则应接近1.0。<br /><b>警"
 "告：</b>此参数不应与etx_ffeth指标一起使用！<br />默认值到“1.0”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr "如果此节点使用 NAT 连接到互联网。默认为“是”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "接口"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -426,15 +441,15 @@ msgstr ""
 "是“mesh”和“ether”。默认为“mesh”。"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "接口"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "接口默认值"
 
@@ -442,30 +457,30 @@ msgstr "接口默认值"
 msgid "Internet protocol"
 msgstr "互联网协议"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr "轮询网络接口以进行配置更改的间隔（秒）。默认值为“2.5”。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr "LQMult-Value 的值无效。必须介于0.01和1.0之间。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr "LQMult-Value 的值无效。您必须在此处使用介于0.01和1.0之间的十进制数。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "已知的 OLSR 路由"
 
@@ -473,30 +488,30 @@ msgstr "已知的 OLSR 路由"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ 老化"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ 算法"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ 鱼眼"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ 级别"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -510,20 +525,20 @@ msgstr "最后一跳"
 msgid "Legend"
 msgstr "Legend"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "库"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "链接质量设置"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -532,8 +547,8 @@ msgstr ""
 "链路质量老化因子（仅适用于 lq 级别2）。调整 etx_float 和 etx_fpm 的参数，值越"
 "小意味着 ETX 值的变化越慢。（允许值介于0.01和1.0之间）"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -548,8 +563,8 @@ msgstr ""
 "etx 变体<br /><b>etx_ffeth</b>：不兼容的变体 etx_ff，允许以太网链接使用 ETX "
 "0.1。<br />默认为“etx_ff”"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -559,10 +574,10 @@ msgstr ""
 "= 不使用链接质量<br /><b>2</b> = 使用链接质量进行 MPR 选择和路由<br />默认"
 "为“2”"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "LinkQuality 乘数"
 
@@ -574,36 +589,37 @@ msgstr "每个节点的链接数（平均）"
 msgid "Links total"
 msgstr "链接总数"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "本地接口 IP"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "MID 间隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "MID 有效期"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "主要 IP"
 
@@ -615,21 +631,22 @@ msgstr ""
 "确保 OLSRd 正在运行，加载了“jsoninfo”插件，在端口9090上配置接受来"
 "自“127.0.0.1”的连接。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "度量"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "模式"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -652,8 +669,8 @@ msgstr ""
 "时使用。示例：<br />将到 fd91:662e:3c58::1 的 LQ 减半：fd91:662e:3c58::1 "
 "0.5<br />将此接口到所有节点的 LQ 减少20％：default 0.8"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "NAT 阈值"
 
@@ -665,7 +682,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "邻居"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "邻居 IP"
 
@@ -674,26 +692,26 @@ msgid "Neighbours"
 msgstr "邻居"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "子网掩码"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "网络"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "网络地址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "Nic 更改轮询间隔"
 
@@ -717,30 +735,32 @@ msgstr "OLSR - HNA-通告"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA6-通告"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - 插件"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR 守护进程"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR 守护进程 - 接口"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR 连接"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "OLSR 网关"
 
@@ -758,11 +778,11 @@ msgstr "橙色"
 msgid "Overview"
 msgstr "概览"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "当前活动的 OLSR 主机网络通告概览"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "当前建立的 OLSR 连接概览"
 
@@ -770,7 +790,7 @@ msgstr "当前建立的 OLSR 连接概览"
 msgid "Overview of currently known OLSR nodes"
 msgstr "当前已知的 OLSR 节点概览"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "当前已知到其他 OLSR 节点的路由概览"
 
@@ -782,40 +802,41 @@ msgstr "OLSR 正在运行的接口概览"
 msgid "Overview of known multiple interface announcements"
 msgstr "已知的多接口通告概览"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "此网络中的智能网关概览"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "插件配置"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "插件"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "OLSR 套接字的轮询速率，以秒为单位。默认值为0.05。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "轮询速率"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "端口"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "前缀"
 
@@ -845,7 +866,8 @@ msgstr "路由"
 msgid "Secondary OLSR interfaces"
 msgstr "辅助 OLSR 接口"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -880,25 +902,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr "信噪比（dB）"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "SmartGW 通告"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "此系统上未配置 SmartGateway。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "源地址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -906,12 +928,12 @@ msgstr ""
 "以千比特/秒为单位指定上行链路的速度。第一个参数是上传，第二个参数是下载。默认"
 "值为“128 1024”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "上行链路的速度"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "状态"
 
@@ -931,34 +953,34 @@ msgstr "从邻居收包的成功率"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "向邻居发包的成功率"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "TC 间隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "TC 有效时间"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS 值"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -971,8 +993,8 @@ msgstr ""
 "卡上运行，当然也可以在任何以太网设备上运行。访问 <a href='http://www.olsr."
 "org'>olsrd.org</a> 获取帮助和文档。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -980,13 +1002,13 @@ msgstr ""
 "固定的使用意愿值。如果未设置，则将根据电池/电源状态动态计算意愿值。默认值"
 "为“3”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "OLSRd 应该服务的接口。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
@@ -994,8 +1016,8 @@ msgstr ""
 "OLSR 使用的端口。通常应使用 IANA 分配的保留端口698。它的值可以在1到65535之"
 "间。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1006,10 +1028,10 @@ msgstr ""
 "IPv6 地址，以使用 IPv6 网关，而无需任何类型的地址转换。前缀长度最大为64位。默"
 "认为“::/0”（无前缀）。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "时间和有效性"
 
@@ -1017,8 +1039,8 @@ msgstr "时间和有效性"
 msgid "Topology"
 msgstr "拓扑"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1028,21 +1050,23 @@ msgstr "IP 流量控制头的服务类型值。默认值为“16”。"
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "无法连接到 OLSR 守护程序！"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "上行链接"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "上行链接使用 NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "使用滞后"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr "有效时间"
 
@@ -1058,12 +1082,12 @@ msgstr "非常好（ETX < 2）"
 msgid "Very good (SNR > 30)"
 msgstr "非常好（SNR > 30）"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1071,17 +1095,17 @@ msgstr ""
 "警告：未安装 kmod-ipip。没有 kmod-ipip，SmartGateway 将无法正常工作，请安装"
 "它。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "体重"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1114,8 +1138,8 @@ msgstr ""
 "将导出哪种上行链路到其他网状节点。通过查找本地 HNA6 ::ffff:0:0/96 或 "
 "2000::/3 来检测上行链路。默认设置为“两者”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "意愿值"
 
@@ -1124,36 +1148,38 @@ msgstr "意愿值"
 msgid "Yellow"
 msgstr "黄色"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "否"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "是"
 
 #~ msgid "Status"
 #~ msgstr "状态"
-
-#~ msgid "Device"
-#~ msgstr "设备"
diff --git a/applications/luci-app-olsr/po/zh-tw/olsr.po b/applications/luci-app-olsr/po/zh-tw/olsr.po
index add8b92f0..007612a62 100644
--- a/applications/luci-app-olsr/po/zh-tw/olsr.po
+++ b/applications/luci-app-olsr/po/zh-tw/olsr.po
@@ -22,32 +22,34 @@ msgstr "活動的 MID 通告"
 msgid "Active OLSR nodes"
 msgstr "活動的 OLSR 節點"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:77
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
 msgid "Active host net announcements"
 msgstr "活動的主機網路通告"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:45
 msgid "Advanced Settings"
 msgstr "進階設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow gateways with NAT"
 msgstr "允許帶 NAT 的閘道器"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:147
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:141
 msgid "Allow the selection of an outgoing ipv4 gateway with NAT"
 msgstr "允許選擇有 NAT 的 IPv4 閘道器"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:149
 msgid "Announce uplink"
 msgstr "通告上行連結"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:86
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:39
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:90
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:47
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:107
 msgid "Announced network"
 msgstr "通告的網路"
 
@@ -63,12 +65,12 @@ msgstr "差（SNR < 5）"
 msgid "Both values must use the dotted decimal notation."
 msgstr "兩個值必須使用點分十進位制表示法。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:30
 msgid "Broadcast address"
 msgstr "廣播位址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:265
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:90
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr "必須是有效的 IPv4 或 IPv6 位址，或“預設”"
 
@@ -88,11 +90,16 @@ msgid ""
 msgstr ""
 "無法獲取任何資料。確保已安裝 jsoninfo 外掛，並允許來自 localhost 的連線。"
 
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+msgid "Device"
+msgstr "裝置"
+
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:75
 msgid "Display"
 msgstr "顯示"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:105
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:112
 msgid "Downlink"
 msgstr "下行連結"
 
@@ -100,24 +107,25 @@ msgstr "下行連結"
 msgid "Download Config"
 msgstr "下載配置"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:57
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:109
 #: applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm:26
 msgid "ETX"
 msgstr "ETX"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:346
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:35
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:365
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:35
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:15
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:15
 msgid "Enable"
 msgstr "啟用"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:140
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:134
 msgid ""
 "Enable SmartGateway. If it is disabled, then all other SmartGateway "
 "parameters are ignored. Default is \"no\"."
@@ -125,13 +133,13 @@ msgstr ""
 "啟用 SmartGateway。如果禁用，則將忽略 SmartGateway 的其他所有引數。預設"
 "值：“no”"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
 msgid "Enable this interface."
 msgstr "啟用這個埠"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -139,13 +147,13 @@ msgstr "已啟用"
 msgid "Expected retransmission count"
 msgstr "預期重發數"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:71
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:65
 msgid "FIB metric"
 msgstr "FIB 度量"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:72
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:66
 msgid ""
 "FIBMetric controls the metric value of the host-routes OLSRd sets. \"flat\" "
 "means that the metric value is always 2. This is the preferred value because "
@@ -159,26 +167,27 @@ msgstr ""
 "值。“approx”也使用 hopcount 作為度量值，但只有在下一次更改時才更新 hopcount。"
 "預設為“flat”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:112
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:106
 msgid "Fisheye mechanism for TCs (checked means on). Default is \"on\""
 msgstr "TC 的魚眼機制（校驗和開啟）。預設為“開啟”"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:100
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
 msgid "Gateway"
 msgstr "閘道器"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31
 msgid "General Settings"
 msgstr "一般設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:39
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:39
 msgid "General settings"
 msgstr "一般設定"
 
@@ -196,8 +205,8 @@ msgid "Green"
 msgstr "綠"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:53
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:402
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:383
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:178
 msgid "HNA"
 msgstr "HNA"
@@ -206,17 +215,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "HNA 通告"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:322
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:165
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:341
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:152
 msgid "HNA interval"
 msgstr "HNA 間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:328
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:171
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:347
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:158
 msgid "HNA validity time"
 msgstr "HNA 有效時長"
 
@@ -224,22 +233,22 @@ msgstr "HNA 有效時長"
 msgid "HNA6 Announcements"
 msgstr "HNA 通告"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:381
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:362
 msgid "Hello"
 msgstr "Hello"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:286
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:129
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:305
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:116
 msgid "Hello interval"
 msgstr "Hello 間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:292
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:135
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:311
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:122
 msgid "Hello validity time"
 msgstr "Hello 有效時長"
 
@@ -257,16 +266,18 @@ msgstr "隱藏 IPv6"
 msgid "Hna4"
 msgstr "Hna4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid "Hna6"
 msgstr "Hna6"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:58
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:110
 msgid "Hops"
 msgstr "躍點"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:118
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:127
 msgid "Hostname"
 msgstr "主機名"
 
@@ -282,8 +293,8 @@ msgid ""
 "networks using HNA6 messages."
 msgstr "OLSR 路由網路中的主機可以使用 HNA6 訊息通告與外部網路的連線。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:117
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:111
 msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
@@ -292,10 +303,10 @@ msgstr ""
 "滯後鏈路檢測（僅適用於 hopcount 度量）。滯後增加了鏈路感測的健壯性，但延遲了"
 "鄰居註冊過程。預設值為“是”"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:217
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:32
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:223
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:32
 msgid "IP Addresses"
 msgstr "IP 位址"
 
@@ -305,17 +316,18 @@ msgid ""
 "for each protocol."
 msgstr "要使用的 IP 版本。如果選擇 6and4，則為每個協議啟動一個 olsrd 例項。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:106
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:61
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:113
 msgid "IPv4"
 msgstr "IPv4"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103
 msgid "IPv4 broadcast"
 msgstr "IPv4 廣播位址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
 msgid ""
 "IPv4 broadcast address for outgoing OLSR packets. One useful example would "
 "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the "
@@ -324,55 +336,56 @@ msgstr ""
 "傳出 OLSR 資料包的 IPv4 廣播位址。一個有用的例子是 255.255.255.255。預設"
 "為“0.0.0.0”，將觸發使用介面的 IP 廣播位址。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:291
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:116
 msgid "IPv4 source"
 msgstr "IPv4 源位址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:292
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:117
 msgid ""
 "IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which "
 "triggers usage of the interface IP."
 msgstr "傳出 OLSR 包的 IPv4 源位址。預設為“0.0.0.0”，將觸發使用介面的 IP。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:114
 msgid "IPv6"
 msgstr "IPv6"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:272
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:110
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:285
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:103
 msgid "IPv6 multicast"
 msgstr "IPv6 組播位址"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:273
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:111
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:286
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:104
 msgid ""
 "IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal "
 "multicast."
 msgstr "IPv6 組播位址。預設為“FF02::6D”，即 manet-router 鏈路本地組播位址。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:28
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:10
 msgid ""
 "IPv6 network must be given in full notation, prefix must be in CIDR notation."
 msgstr "IPv6 網路必須完整表出，字首必須是 CIDR 表示法。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:278
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:122
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:297
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:109
 msgid "IPv6 source"
 msgstr "IPv6 源位址"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:279
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:123
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:298
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:110
 msgid ""
 "IPv6 src prefix. OLSRd will choose one of the interface IPs which matches "
 "the prefix of this parameter. Default is \"0::/0\", which triggers the usage "
@@ -381,13 +394,13 @@ msgstr ""
 "IPv6 源字首。OLSRd 將選擇一個與此引數字首匹配的介面 IP。預設為“0::/0”，觸發使"
 "用介面的非鏈路本地 IP。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid "IPv6-Prefix of the uplink"
 msgstr "IPv6 上行鏈路字首"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:202
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:196
 msgid ""
 "If the route to the current gateway is to be changed, the ETX value of this "
 "gateway is multiplied with this value before it is compared to the new one. "
@@ -399,24 +412,26 @@ msgstr ""
 "器的ETX值乘以該值。引數可以是介於0.1和1.0之間的值，但如果更改則應接近1.0。"
 "<br /><b>警告：</b>此引數不應與etx_ffeth指標一起使用！<br />預設值到“1.0”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid ""
 "If this Node uses NAT for connections to the internet. Default is \"yes\"."
 msgstr "如果此節點使用 NAT 連線到網際網路。預設為“是”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:27
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:27
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:23
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:119
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:62
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:49
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:109
 msgid "Interface"
 msgstr "介面"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:221
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:52
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:227
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:52
 msgid ""
 "Interface Mode is used to prevent unnecessary packet forwarding on switched "
 "ethernet interfaces. valid Modes are \"mesh\" and \"ether\". Default is "
@@ -426,15 +441,15 @@ msgstr ""
 "是“mesh”和“ether”。預設為“mesh”。"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:354
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:335
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:14
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:163
 msgid "Interfaces"
 msgstr "介面"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:218
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:212
 msgid "Interfaces Defaults"
 msgstr "介面預設值"
 
@@ -442,30 +457,30 @@ msgstr "介面預設值"
 msgid "Internet protocol"
 msgstr "網際網路協議"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:60
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:54
 msgid ""
 "Interval to poll network interfaces for configuration changes (in seconds). "
 "Default is \"2.5\"."
 msgstr "輪詢網路介面以進行配置更改的間隔（秒）。預設值為“2.5”。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:262
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:268
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
 msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
 msgstr "LQMult-Value 的值無效。必須介於0.01和1.0之間。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:96
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:96
 msgid ""
 "Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
 "and 1.0 here."
 msgstr "LQMult-Value 的值無效。您必須在此處使用介於0.01和1.0之間的十進位制數。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
 msgid "Known OLSR routes"
 msgstr "已知的 OLSR 路由"
 
@@ -473,30 +488,30 @@ msgstr "已知的 OLSR 路由"
 msgid "LQ"
 msgstr "LQ"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:90
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:84
 msgid "LQ aging"
 msgstr "LQ 老化"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:96
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:90
 msgid "LQ algorithm"
 msgstr "LQ 演算法"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105
 msgid "LQ fisheye"
 msgstr "LQ 魚眼"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76
 msgid "LQ level"
 msgstr "LQ 級別"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:256
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:87
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:262
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:87
 msgid ""
 "LQMult requires two values (IP address or 'default' and multiplicator) "
 "separated by space."
@@ -510,20 +525,20 @@ msgstr "最後一跳"
 msgid "Legend"
 msgstr "Legend"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:23
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:257
 msgid "Library"
 msgstr "庫"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:43
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:43
 msgid "Link Quality Settings"
 msgstr "連結質量設定"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:91
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:85
 msgid ""
 "Link quality aging factor (only for lq level 2). Tuning parameter for "
 "etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
@@ -532,8 +547,8 @@ msgstr ""
 "鏈路質量老化因子（僅適用於 lq 級別2）。調整 etx_float 和 etx_fpm 的引數，值越"
 "小意味著 ETX 值的變化越慢。（允許值介於0.01和1.0之間）"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
 msgid ""
 "Link quality algorithm (only for lq level 2).<br /><b>etx_float</b>: "
 "floating point ETX with exponential aging<br /><b>etx_fpm</b> : same as "
@@ -548,8 +563,8 @@ msgstr ""
 "ETX 計算的 etx 變體<br /><b>etx_ffeth</b>：不相容的變體 etx_ff，允許乙太網連"
 "結使用 ETX 0.1。<br />預設為“etx_ff”"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
 msgid ""
 "Link quality level switch between hopcount and cost-based (mostly ETX) "
 "routing.<br /><b>0</b> = do not use link quality<br /><b>2</b> = use link "
@@ -559,10 +574,10 @@ msgstr ""
 "= 不使用連結質量<br /><b>2</b> = 使用連結質量進行 MPR 選擇和路由<br />預設"
 "為“2”"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:239
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:70
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:245
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:70
 msgid "LinkQuality Multiplicator"
 msgstr "LinkQuality 乘數"
 
@@ -574,36 +589,37 @@ msgstr "每個節點的連結數（平均）"
 msgid "Links total"
 msgstr "連結總數"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:120
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:129
 msgid "Local interface IP"
 msgstr "本地介面 IP"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:58
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:395
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:376
 msgid "MID"
 msgstr "MID"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:310
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:153
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:329
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:140
 msgid "MID interval"
 msgstr "MID 間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:316
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:159
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:335
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:146
 msgid "MID validity time"
 msgstr "MID 有效期"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
 msgid "MTU"
 msgstr "MTU"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
 msgid "Main IP"
 msgstr "主要 IP"
 
@@ -615,21 +631,22 @@ msgstr ""
 "確保 OLSRd 正在執行，載入了“jsoninfo”外掛，在埠9090上配置接受來"
 "自“127.0.0.1”的連線。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:110
 msgid "Metric"
 msgstr "度量"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
 msgstr "模式"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
 msgid ""
 "Multiply routes with the factor given here. Allowed values are between 0.01 "
 "and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
@@ -652,8 +669,8 @@ msgstr ""
 "時使用。示例：<br />將到 fd91:662e:3c58::1 的 LQ 減半：fd91:662e:3c58::1 "
 "0.5<br />將此介面到所有節點的 LQ 減少20％：default 0.8"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
 msgid "NAT threshold"
 msgstr "NAT 閾值"
 
@@ -665,7 +682,8 @@ msgstr "NLQ"
 msgid "Neighbors"
 msgstr "鄰居"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:60
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:126
 msgid "Neighbour IP"
 msgstr "鄰居 IP"
 
@@ -674,26 +692,26 @@ msgid "Neighbours"
 msgstr "鄰居"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:21
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:29
 msgid "Netmask"
 msgstr "子網掩碼"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:354
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:44
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:373
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:44
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:160
 msgid "Network"
 msgstr "網路"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:17
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:34
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:16
 msgid "Network address"
 msgstr "網路位址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:59
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:53
 msgid "Nic changes poll interval"
 msgstr "Nic 更改輪詢間隔"
 
@@ -717,30 +735,32 @@ msgstr "OLSR - HNA-通告"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA6-通告"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:9
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:216
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:9
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:216
 msgid "OLSR - Plugins"
 msgstr "OLSR - 外掛"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:12
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:12
 #: applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm:8
 msgid "OLSR Daemon"
 msgstr "OLSR 守護程序"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:14
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:14
 msgid "OLSR Daemon - Interface"
 msgstr "OLSR 守護程序 - 介面"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:107
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:117
 msgid "OLSR connections"
 msgstr "OLSR 連線"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:102
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:40
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:91
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:48
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:108
 msgid "OLSR gateway"
 msgstr "OLSR 閘道器"
 
@@ -758,11 +778,11 @@ msgstr "橙色"
 msgid "Overview"
 msgstr "概覽"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:82
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
 msgstr "當前活動的 OLSR 主機網路通告概覽"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:112
+#: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:122
 msgid "Overview of currently established OLSR connections"
 msgstr "當前建立的 OLSR 連線概覽"
 
@@ -770,7 +790,7 @@ msgstr "當前建立的 OLSR 連線概覽"
 msgid "Overview of currently known OLSR nodes"
 msgstr "當前已知的 OLSR 節點概覽"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:103
 msgid "Overview of currently known routes to other OLSR nodes"
 msgstr "當前已知到其他 OLSR 節點的路由概覽"
 
@@ -782,40 +802,41 @@ msgstr "OLSR 正在執行的介面概覽"
 msgid "Overview of known multiple interface announcements"
 msgstr "已知的多介面通告概覽"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:96
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
 msgid "Overview of smart gateways in this network"
 msgstr "此網路中的智慧閘道器概覽"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:11
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:11
 msgid "Plugin configuration"
 msgstr "外掛配置"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr4.lua:29
 #: applications/luci-app-olsr/luasrc/controller/olsr6.lua:29
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:240
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:240
 msgid "Plugins"
 msgstr "外掛"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
 msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
 msgstr "OLSR 套接字的輪詢速率，以秒為單位。預設值為0.05。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
 msgid "Pollrate"
 msgstr "輪詢速率"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:126
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:120
 msgid "Port"
 msgstr "埠"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:38
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua:20
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:63
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:115
 msgid "Prefix"
 msgstr "字首"
 
@@ -845,7 +866,8 @@ msgstr "路由"
 msgid "Secondary OLSR interfaces"
 msgstr "輔助 OLSR 介面"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:101
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
 msgid "Selected"
 msgstr ""
 
@@ -880,25 +902,25 @@ msgid "Signal Noise Ratio in dB"
 msgstr "信噪比（dB）"
 
 #: applications/luci-app-olsr/luasrc/controller/olsr.lua:64
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid "SmartGW"
 msgstr "SmartGW"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:89
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:97
 msgid "SmartGW announcements"
 msgstr "SmartGW 通告"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:147
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:150
 msgid "SmartGateway is not configured on this system."
 msgstr "此係統上未配置 SmartGateway。"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:28
 msgid "Source address"
 msgstr "源位址"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid ""
 "Specifies the speed of the uplink in kilobits/s. First parameter is "
 "upstream, second parameter is downstream. Default is \"128 1024\"."
@@ -906,12 +928,12 @@ msgstr ""
 "以千位元/秒為單位指定上行鏈路的速度。第一個引數是上傳，第二個引數是下載。預設"
 "值為“128 1024”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:176
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:170
 msgid "Speed of the uplink"
 msgstr "上行鏈路的速度"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:24
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:25
 msgid "State"
 msgstr "狀態"
 
@@ -931,34 +953,34 @@ msgstr "從鄰居收包的成功率"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "向鄰居發包的成功率"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:388
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:369
 msgid "TC"
 msgstr "TC"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:298
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:141
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:317
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:128
 msgid "TC interval"
 msgstr "TC 間隔"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:304
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:147
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:323
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:134
 msgid "TC validity time"
 msgstr "TC 有效時間"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:65
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:59
 msgid "TOS value"
 msgstr "TOS 值"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:13
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:15
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:13
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:15
 msgid ""
 "The OLSR daemon is an implementation of the Optimized Link State Routing "
 "protocol. As such it allows mesh routing for any network equipment. It runs "
@@ -971,8 +993,8 @@ msgstr ""
 "卡上執行，當然也可以在任何乙太網裝置上執行。訪問 <a href='http://www.olsr."
 "org'>olsrd.org</a> 獲取幫助和文件。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:194
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:188
 msgid ""
 "The fixed willingness to use. If not set willingness will be calculated "
 "dynamically based on battery/power status. Default is \"3\"."
@@ -980,21 +1002,21 @@ msgstr ""
 "固定的使用意願值。如果未設定，則將根據電池/電源狀態動態計算意願值。預設值"
 "為“3”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:45
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:45
 msgid "The interface OLSRd should serve."
 msgstr "OLSRd 應該服務的介面。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:127
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:121
 msgid ""
 "The port OLSR uses. This should usually stay at the IANA assigned port 698. "
 "It can have a value between 1 and 65535."
 msgstr ""
 "OLSR 使用的埠。通常應使用 IANA 分配的保留埠698。它的值可以在1到65535之間。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
 msgid ""
 "This can be used to signal the external IPv6 prefix of the uplink to the "
 "clients. This might allow a client to change it's local IPv6 address to use "
@@ -1005,10 +1027,10 @@ msgstr ""
 "IPv6 位址，以使用 IPv6 閘道器，而無需任何型別的位址轉換。字首長度最大為64位。"
 "默認為“::/0”（無字首）。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:33
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:33
 msgid "Timing and Validity"
 msgstr "時間和有效性"
 
@@ -1016,8 +1038,8 @@ msgstr "時間和有效性"
 msgid "Topology"
 msgstr "拓撲"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:66
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:60
 msgid ""
 "Type of service value for the IP header of control traffic. Default is "
 "\"16\"."
@@ -1027,21 +1049,23 @@ msgstr "IP 流量控制頭的服務型別值。預設值為“16”。"
 msgid "Unable to connect to the OLSR daemon!"
 msgstr "無法連線到 OLSR 守護程式！"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:104
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:59
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:111
 msgid "Uplink"
 msgstr "上行連結"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
 msgid "Uplink uses NAT"
 msgstr "上行連結使用 NAT"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:116
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:110
 msgid "Use hysteresis"
 msgstr "使用滯後"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:88
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:41
+#: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:92
 msgid "Validity Time"
 msgstr "有效時間"
 
@@ -1057,12 +1081,12 @@ msgstr "非常好（ETX < 2）"
 msgid "Very good (SNR > 30)"
 msgstr "非常好（SNR > 30）"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:27
 msgid "WLAN"
 msgstr "WLAN"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:44
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:44
 msgid ""
 "Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not "
 "work, please install it."
@@ -1070,17 +1094,17 @@ msgstr ""
 "警告：未安裝 kmod-ipip。沒有 kmod-ipip，SmartGateway 將無法正常工作，請安裝"
 "它。"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:229
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:235
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
 msgid "Weight"
 msgstr "體重"
 
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:61
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:61
 msgid ""
 "When multiple links exist between hosts the weight of interface is used to "
 "determine the link to use. Normally the weight is automatically calculated "
@@ -1113,8 +1137,8 @@ msgstr ""
 "將匯出哪種上行鏈路到其他網狀節點。通過查詢本地 HNA6 ::ffff:0:0/96 或 "
 "2000::/3 來檢測上行鏈路。預設設定為“兩者”。"
 
-#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:193
+#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:187
 msgid "Willingness"
 msgstr "意願值"
 
@@ -1123,36 +1147,38 @@ msgstr "意願值"
 msgid "Yellow"
 msgstr "黃色"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "down"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
+msgid "infinate"
+msgstr ""
+
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
 msgstr "否"
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:36
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
 msgstr ""
 
-#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
+#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:34
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:35
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:129
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
-#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:135
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:133
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
+#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
 msgstr "是"
 
 #~ msgid "Status"
 #~ msgstr "狀態"
-
-#~ msgid "Device"
-#~ msgstr "裝置"
diff --git a/applications/luci-app-opkg/po/ca/opkg.po b/applications/luci-app-opkg/po/ca/opkg.po
index 7343a5abf..af9336da0 100644
--- a/applications/luci-app-opkg/po/ca/opkg.po
+++ b/applications/luci-app-opkg/po/ca/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Accions"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,284 +33,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configuració"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Descripció"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Descarrega i instal·la el paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Error"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtre"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Espai lliure"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instal·la"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instal·la"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instal·la"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Vés a la pàgina de configuració"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descarrega i instal·la el paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "No hi ha informació disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Cerca paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Total disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "No connectat"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "D'acord"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configuració d&#39;OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nom del paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nom del paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Treu"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Restableix"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Desa"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Configuració de dispositiu"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Mida"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Mida (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Programari"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Actualitza les llistes"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Actualitza les llistes"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versió"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Esperant que s'acabi l'ordre..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "desconegut"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/cs/opkg.po b/applications/luci-app-opkg/po/cs/opkg.po
index bbcec8a88..e7853956f 100644
--- a/applications/luci-app-opkg/po/cs/opkg.po
+++ b/applications/luci-app-opkg/po/cs/opkg.po
@@ -11,19 +11,19 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Akce"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Dostupné"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,284 +31,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Storno"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Nastavení"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Popis"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Stáhnout a nainstalovat balíček"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Chyba"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtr"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Volné místo"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instalovat"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instalovat"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instalovat"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Přejít na související konfigurační stránku"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Stáhnout a nainstalovat balíček"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Údaje nejsou k dispozici"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Vyhledat balíček"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Dostupná celkem"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Nepřipojeno"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Konfigurace balíčků OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Název balíčku"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Název balíčku"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Odstranit"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Uložit"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Nastavení zařízení"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Velikost"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Aktualizovat seznamy"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Aktualizovat seznamy"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Verze"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Čekání na dokončení příkazu..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "neznámý"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/de/opkg.po b/applications/luci-app-opkg/po/de/opkg.po
index 0fe17a556..437a7f824 100644
--- a/applications/luci-app-opkg/po/de/opkg.po
+++ b/applications/luci-app-opkg/po/de/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.0.5\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Aktionen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr "Unbenutzte Abhängigkeiten automatisch entfernen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Verfügbar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -39,75 +39,75 @@ msgstr ""
 "Konfigurationsdateien kann zwar geändert werden, wird aber überlicherweise "
 "bei Systemupdates zurückgesetzt."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr "Zurücksetzen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr "Konfiguriere opkg…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Beschreibung"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr "Details für Paket <em>%h</em>"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "Schließen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr "Einträge %d-%d von %d"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Paket herunterladen und installieren"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr "Fehler"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr "Paketmanager ausführen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filter"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Freier Platz"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Installieren"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr "Installiert"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
@@ -116,92 +116,92 @@ msgstr ""
 "Sicherheitsrisiko! Soll wirklich versucht werden, <em>%h</em> zu "
 "installieren?"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr "Installieren…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 msgid "Loading configuration data…"
 msgstr "Lade Konfigurationsdaten…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr "Lade Paketinformationen…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr "Paket manuell installieren"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr "Aktualisierung benötigt"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr "Nächste Seite"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 msgid "No packages"
 msgstr "Keine Pakete"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr "Keine auf \"<strong>%h</strong>\" zutreffenden Pakete."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 msgid "Not available"
 msgstr "Nicht verfügbar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr "Nicht installiert"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 msgid "OPKG Configuration"
 msgstr "OPKG-Konfiguration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Paketname"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr "Paketname oder URL…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr "Vorige Seite"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "Soll wirklich versucht werden, <em>%h</em> zu installieren?"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Entfernen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr "Paket <em>%h</em> entfernen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 "Benötige etwa %.1024mB Speicherplatz für die Installation von %d Pakete(n)."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
@@ -209,48 +209,48 @@ msgstr ""
 "Benötige Version %h %h,\n"
 "aber %h installiert"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 "Benötigtes abhängiges Paket <em>%h</em> ist in keinem Repository verfügbar."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr "Benötigt Update auf Version %h %h"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Speichern"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr "Speichere Konfigurationsdaten…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Größe"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Größe (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Paketverwaltung"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 "Das <em>opkg %h</em> Kommando wurde mit Fehlercode <code>%d</code> beendet."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
@@ -258,12 +258,12 @@ msgstr ""
 "Die installierte Version von Paket <em>%h</em> ist nicht kompatibel, "
 "benötige Version %s während %s installiert ist."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 "Das Paket <em>%h</em> ist in keinem konfiguriertem Repository verfügbar."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
@@ -271,50 +271,50 @@ msgstr ""
 "Die Repository-Version von Paket <em>%h</em> ist nicht kompatibel, benötige "
 "Version %s aber nur %s ist verfügbar."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr "Tippen zum Filtern…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr "Listen aktualisieren…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr "Aktualisierungen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr "Aktualisieren…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr "Version inkompatibel"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Warte auf das <em>opkg %h</em> Kommando…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "unbekannt"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr "ca. %.1024mB komprimiert"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr "ca. %.1024mB installiert"
diff --git a/applications/luci-app-opkg/po/el/opkg.po b/applications/luci-app-opkg/po/el/opkg.po
index 83eb0939b..b1cc0e068 100644
--- a/applications/luci-app-opkg/po/el/opkg.po
+++ b/applications/luci-app-opkg/po/el/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Διαθέσιμο"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,281 +33,281 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Παραμετροποίηση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Κατέβασμα και εγκατάσταση πακέτου"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Σφάλμα"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Φίλτρο"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Ελεύθερος χώρος"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Εγκατάσταση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Εγκατάσταση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Εγκατάσταση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Μετάβαση στη σχετική σελίδα ρυθμίσεων"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Κατέβασμα και εγκατάσταση πακέτου"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Δεν υπάρχουν πληροφορίες διαθέσιμες"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Εύρεση πακέτου"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Διαθέσιμο Συνολικά"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Εγκατάσταση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "Εντάξει"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Παραμετροποίηση OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Όνομα πακέτου"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Όνομα πακέτου"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Αφαίρεση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Αρχικοποίηση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Παραμετροποίηση Συσκευής"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Λογισμικό"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Έκδοση"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/en/opkg.po b/applications/luci-app-opkg/po/en/opkg.po
index 90e4a9848..3c1757a08 100644
--- a/applications/luci-app-opkg/po/en/opkg.po
+++ b/applications/luci-app-opkg/po/en/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Actions"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Available"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,281 +33,281 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Cancel"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configuration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Description"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Download and install package"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Error"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filter"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Install"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Install"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Install"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Go to relevant configuration page"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Download and install package"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Find package"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "(%s available)"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Install"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "OPKG-Configuration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Package name"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Package name"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Remove"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Save"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Device Configuration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Size"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/es/opkg.po b/applications/luci-app-opkg/po/es/opkg.po
index 5fd9f73de..4b99da029 100644
--- a/applications/luci-app-opkg/po/es/opkg.po
+++ b/applications/luci-app-opkg/po/es/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Acciones"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,284 +33,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configuración"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Descripción"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Descargar e instalar paquete"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Error"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Espacio libre"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Ir a la página principal de configuración"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descargar e instalar paquete"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "No hay información disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Buscar paquete"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Total disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "No conectado"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "Aceptar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configuración de OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nombre del paquete"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nombre del paquete"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Desinstalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Guardar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Configuración del dispositivo"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Tamaño"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Instalación de programas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Actualizar listas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Actualizar listas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versión"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Esperando a que termine el comando..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "desconocido"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/fr/opkg.po b/applications/luci-app-opkg/po/fr/opkg.po
index c175fc054..601bd5302 100644
--- a/applications/luci-app-opkg/po/fr/opkg.po
+++ b/applications/luci-app-opkg/po/fr/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Actions"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,284 +33,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Annuler"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configuration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Description"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Télécharge et installe le paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Erreur"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtrer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Espace libre"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Aller à la page de configuration correspondante"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Télécharge et installe le paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Information indisponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Trouver un paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Total disponible"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Non connecté"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configuration OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nom du paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nom du paquet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Désinstaller"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Remise à zéro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Configuration de l'équipement"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Taille"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Logiciels"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Mettre les listes à jour"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Mettre les listes à jour"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "En attente de la fin de la commande..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "inconnu"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/he/opkg.po b/applications/luci-app-opkg/po/he/opkg.po
index 2fc391206..767e44822 100644
--- a/applications/luci-app-opkg/po/he/opkg.po
+++ b/applications/luci-app-opkg/po/he/opkg.po
@@ -11,19 +11,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "פעולות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "זמין"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,279 +31,279 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "בטל"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "הגדרות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "תיאור"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "הורד והתקן חבילות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "שגיאה"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "הגדרות נפוצות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "הורד והתקן חבילות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "חבילות זמינות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "סה\"כ פנוי"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "לא מחובר"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "הגדרות"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "שם החבילה"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "שם החבילה"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "הגדרות מכשיר"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "תוכנה"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "גרסה"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/hu/opkg.po b/applications/luci-app-opkg/po/hu/opkg.po
index da4ed6fc0..44d4ab69a 100644
--- a/applications/luci-app-opkg/po/hu/opkg.po
+++ b/applications/luci-app-opkg/po/hu/opkg.po
@@ -11,19 +11,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Műveletek"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Elérhető"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,284 +31,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Beállítás"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Leírás"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Csomag letöltése és telepítése"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Hiba"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Szűrő"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Szabad hely"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Telepítés"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Telepítés"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Telepítés"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Ugrás a tárgyhoz tartozó beállításokhoz"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Csomag letöltése és telepítése"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Nincs elérhető információ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Csomag keresése"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Összes elérhető"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Nincs kapcsolódva"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "OPKG-Beállítások"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Csomagnév"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Csomagnév"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Visszaállítás"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Mentés"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Eszköz beállítások"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Méret"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Szoftver"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Listák frissítése"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Listák frissítése"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Verzió"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Várakozás a parancs befejezésére..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/it/opkg.po b/applications/luci-app-opkg/po/it/opkg.po
index 68f19b814..b2a6edbdd 100644
--- a/applications/luci-app-opkg/po/it/opkg.po
+++ b/applications/luci-app-opkg/po/it/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Azioni"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponibile"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,284 +33,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Annulla"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configurazione"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Descrizione"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Scarica e installa pacchetto"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Errore"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Spazio libero"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Installa"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Installa"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Installa"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Vai alla pagina di configurazione relativa"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Scarica e installa pacchetto"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Nessuna informazione disponibile"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Cerca pacchetto"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Totale"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Non connesso"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configurazione di OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nome pacchetto"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nome pacchetto"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Salva"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Configurazione del dispositivo"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Dimensione"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Aggiorna liste"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Aggiorna liste"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versione"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "In attesa del comando da completare..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/ja/opkg.po b/applications/luci-app-opkg/po/ja/opkg.po
index 456d82e82..53f568a5c 100644
--- a/applications/luci-app-opkg/po/ja/opkg.po
+++ b/applications/luci-app-opkg/po/ja/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.2\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "操作"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr "使用されない依存パッケージを自動的に削除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "利用可能"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -37,75 +37,75 @@ msgstr ""
 "ポジトリの登録に使用します。これら以外のファイル内の設定を変更しても、通常は "
 "<em>sysupgrade</em> 時に保持されません。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr "クリア"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr "opkg を設定…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr "依存関係"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "詳細"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr "<em>%h</em> パッケージの詳細"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "閉じる"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr "%d - %d を表示中（全 %d）"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "パッケージのダウンロードとインストール"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr "エラー"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr "パッケージ マネージャーを実行中"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "フィルタ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "ディスクの空き容量"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "インストール"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr "インストール済"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
@@ -113,91 +113,91 @@ msgstr ""
 "信頼されていない提供元からのパッケージのインストールは、セキュリティ リスクを"
 "伴います！ <em>%h</em> のインストールを試行してもよろしいですか？"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr "インストール…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 msgid "Loading configuration data…"
 msgstr "設定データをロード中…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr "パッケージ情報をロード中…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr "パッケージの手動インストール"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr "要アップグレード"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr "次のページ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "情報がありません"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 msgid "No packages"
 msgstr "パッケージがありません"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr "\"<strong>%h</strong>\" に一致するパッケージはありません。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 msgid "Not available"
 msgstr "利用不可"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr "未インストール"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 msgid "OPKG Configuration"
 msgstr "OPKG 設定"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "パッケージ名"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr "パッケージ名または URL…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr "前のページ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "<em>%h</em> のインストールを試行してもよろしいですか？"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "削除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr "<em>%h</em> パッケージを削除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr "インストールには約 %.1024mB の領域が必要です（上記 %d パッケージ）。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
@@ -205,47 +205,47 @@ msgstr ""
 "必要バージョン: %h %h,\n"
 "インストール済: %h"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 "必須の依存パッケージ <em>%h</em> は、設定済みのリポジトリでは利用できません。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr "%h %h への更新が必要です"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "リセット"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "保存"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr "設定データを保存中…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "サイズ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "サイズ (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr "<em>opkg %h</em> コマンドが失敗しました。（コード <code>%d</code>）"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
@@ -253,11 +253,11 @@ msgstr ""
 "<em>%h</em> のインストール済みバージョンは互換性がありません。 %s が、インス"
 "トールされている %s には必要です。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr "<em>%h</em> パッケージは、設定済みのリポジトリでは利用できません。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
@@ -265,50 +265,50 @@ msgstr ""
 "<em>%h</em> パッケージのリポジトリ バージョンは互換性がありません。 %s が必要"
 "ですが、 %s のみ利用可能です。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr "入力して検索…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr "リストを更新…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr "更新"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr "アップグレード…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "バージョン"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr "互換性の無いバージョン"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "<em>opkg %h</em コマンドを実行中です…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "不明"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr "～ %.1024mB（圧縮後）"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr "～ %.1024mB（インストール後）"
diff --git a/applications/luci-app-opkg/po/ko/opkg.po b/applications/luci-app-opkg/po/ko/opkg.po
index afcfb75bd..770726de7 100644
--- a/applications/luci-app-opkg/po/ko/opkg.po
+++ b/applications/luci-app-opkg/po/ko/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "관리 도구"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,281 +33,281 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "설정"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "설명"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "패키지 다운로드 후 설치"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "필터"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "여유 공간"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "설치"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "설치"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "설치"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "공통 설정"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "패키지 다운로드 후 설치"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "이용 가능한 정보가 없습니다"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "패키지 찾기"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "총 이용 가능한 양"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "연결되지 않음"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "OPKG-설정"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "패키지 이름"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "패키지 이름"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "제거"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "초기화"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "저장"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "장치 설정"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Size"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "크기 (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "소프트웨어"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "버전"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "실행한 명령이 끝나기를 기다리는 중입니다..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/ms/opkg.po b/applications/luci-app-opkg/po/ms/opkg.po
index 2fb31741f..b5fc58416 100644
--- a/applications/luci-app-opkg/po/ms/opkg.po
+++ b/applications/luci-app-opkg/po/ms/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Aksi"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Boleh didapati"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,280 +33,280 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Batal"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Konfigurasi"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Keterangan"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Turun dan memasang pakej"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Kesalahan"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Penapis"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Memasang"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Memasang"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Memasang"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Menuju ke halaman konfigurasi yang relevan"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Turun dan memasang pakej"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Cari pakej"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "(%s sedia)"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Memasang"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "Baik"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "OPKG-Konfigurasi"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nama pakej"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nama pakej"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Menghapuskan"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Simpan"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Saiz"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Perisian"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versi"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/no/opkg.po b/applications/luci-app-opkg/po/no/opkg.po
index 8fcb10e90..30facb2e3 100644
--- a/applications/luci-app-opkg/po/no/opkg.po
+++ b/applications/luci-app-opkg/po/no/opkg.po
@@ -8,19 +8,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Handlinger"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -28,284 +28,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Konfigurasjon"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Last ned og installer pakken"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Feil"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filter"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Ledig plass"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Installer"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Gå til relevant konfigurasjonen side"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Last ned og installer pakken"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Ingen informasjon tilgjengelig"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Finn pakke"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Totalt Tilgjengelig"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Ikke tilkoblet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "<abbr title=\"Open PacKaGe Management\">OPKG</abbr>-Konfigurasjon"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Pakkenavn"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Pakkenavn"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Avinstaller"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Nullstill"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Lagre"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Enhet Konfigurasjon"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Størrelse"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Programvare"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Oppdater lister"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Oppdater lister"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versjon"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Venter på at kommando fullføres..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "ukjent"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/pl/opkg.po b/applications/luci-app-opkg/po/pl/opkg.po
index 5d9afbadf..4b0f729a5 100644
--- a/applications/luci-app-opkg/po/pl/opkg.po
+++ b/applications/luci-app-opkg/po/pl/opkg.po
@@ -14,19 +14,19 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Akcje"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Dostępne"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -34,285 +34,285 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Konfiguracja"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Opis"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Pobierz i zainstaluj pakiet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Błąd"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtr"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Wolna przestrzeń"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instaluj"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instaluj"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instaluj"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Zatwierdzanie konfiguracji…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Pobierz i zainstaluj pakiet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 #, fuzzy
 msgid "Needs upgrade"
 msgstr "Wymuś uaktualnienie"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Brak dostępnych informacji"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Znajdź pakiet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Całkowicie dostępna"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Nie podłączony"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Konfiguracja OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nazwa pakietu"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nazwa pakietu"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Usuń"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Resetuj"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Zapisz"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Zatwierdzanie konfiguracji…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Rozmiar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Rozmiar (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Oprogramowanie"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Aktualizuj listy"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Aktualizuj listy"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Wersja"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Trwa wykonanie polecenia..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "nieznane"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/pt-br/opkg.po b/applications/luci-app-opkg/po/pt-br/opkg.po
index 5ad0381dc..20aed2b51 100644
--- a/applications/luci-app-opkg/po/pt-br/opkg.po
+++ b/applications/luci-app-opkg/po/pt-br/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Ações"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponível"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,285 +33,285 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configuração"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Descrição"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "Dispensar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Baixe e instale o pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Erro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Espaço livre"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Iniciando a aplicação da configuração..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Baixe e instale o pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 #, fuzzy
 msgid "Needs upgrade"
 msgstr "Forçar a atualização"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Nenhuma informação disponível"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Procurar pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Total Disponível"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Não conectado"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configuração-OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nome do Pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nome do Pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Remover"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Limpar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Salvar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Iniciando a aplicação da configuração..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Tamanho"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Tamanho (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Atualizar listas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Atualizar listas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versão"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Esperando o término do comando..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "desconhecido"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/pt/opkg.po b/applications/luci-app-opkg/po/pt/opkg.po
index a71298ba6..2bf26ec1a 100644
--- a/applications/luci-app-opkg/po/pt/opkg.po
+++ b/applications/luci-app-opkg/po/pt/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Acções"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponível"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -33,284 +33,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configuração"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Descrição"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Descarregar e instalar pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Erro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtro"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Espaço livre"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instalar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Ir para a página respectiva de configuração"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descarregar e instalar pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Sem informação disponível"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Procurar pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Total Disponível"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Não ligado"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configuração-OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Nome do pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Nome do pacote"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Remover"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Salvar"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Configuração do Dispositivo"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Tamanho"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Actualizar listas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Actualizar listas"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versão"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "A aguardar que o comando termine..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "desconhecido"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/ro/opkg.po b/applications/luci-app-opkg/po/ro/opkg.po
index 93ad79ed3..403525371 100644
--- a/applications/luci-app-opkg/po/ro/opkg.po
+++ b/applications/luci-app-opkg/po/ro/opkg.po
@@ -12,19 +12,19 @@ msgstr ""
 "20)) ? 1 : 2);;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Actiune"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Disponibil"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -32,281 +32,281 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Anuleaza"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Configurare"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Descriere"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Descarca si instaleaza pachetul"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Eroare"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtreaza"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Spatiu liber"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Instalati"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Instalati"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Instalati"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Configurarea obisnuita"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Descarca si instaleaza pachetul"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Nici o informatie disponibila"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Gaseste pachet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Total disponibil"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Nu este conectat"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Configuratia-OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Numele pachetului"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Numele pachetului"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Elimina"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Salveaza"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Configurarea dispozitivului"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Marime"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Software"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versiune"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "necunoscut"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/ru/opkg.po b/applications/luci-app-opkg/po/ru/opkg.po
index b721983a8..21bd0fa8d 100644
--- a/applications/luci-app-opkg/po/ru/opkg.po
+++ b/applications/luci-app-opkg/po/ru/opkg.po
@@ -15,19 +15,19 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Действия"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Доступно"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -35,285 +35,285 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Отменить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Настройка config файла"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Описание"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "Отклонить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Загрузить и установить пакет"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Ошибка"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Фильтр"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Свободное место"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Установить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Установить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Установить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Применение конфигурации..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Загрузить и установить пакет"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 #, fuzzy
 msgid "Needs upgrade"
 msgstr "Принудительная прошивка"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Нет доступной информации"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Найти пакет"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Всего доступно"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Не подключено"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Настройка OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Имя пакета"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Имя пакета"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Удалить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Сбросить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Сохранить"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Применение конфигурации..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Размер"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Размер (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Программное обеспечение"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Обновить списки"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Обновить списки"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Версия"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Ожидание завершения выполнения команды..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "неизвестный"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/sk/opkg.po b/applications/luci-app-opkg/po/sk/opkg.po
index 910ae6d88..d83d7ef59 100644
--- a/applications/luci-app-opkg/po/sk/opkg.po
+++ b/applications/luci-app-opkg/po/sk/opkg.po
@@ -9,19 +9,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -29,269 +29,269 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 msgid "Loading configuration data…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 msgid "No packages"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 msgid "Not available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 msgid "OPKG Configuration"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/sv/opkg.po b/applications/luci-app-opkg/po/sv/opkg.po
index 8e29a7b0f..bff244940 100644
--- a/applications/luci-app-opkg/po/sv/opkg.po
+++ b/applications/luci-app-opkg/po/sv/opkg.po
@@ -11,19 +11,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,284 +31,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Konfiguration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Beskrivning"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Ladda ner och installera paket"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Fel"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Filtrera"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Fritt utrymme"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Installera"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Installera"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Installera"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Gå till relevant konfigurationssida"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Ladda ner och installera paket"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Ingen information tillgänglig"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Hitta paket"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Totalt tillgängligt"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Inte ansluten"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Konfiguration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Paketnamn"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Paketnamn"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Ta bort"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Återställ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Spara"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Enhetskonfiguration"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Storlek"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Storlek (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Mjukvara"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "Uppdatera listor"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "Uppdatera listor"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Version"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Väntar på att kommandot ska avsluta..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "okänd"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/templates/opkg.pot b/applications/luci-app-opkg/po/templates/opkg.pot
index 9e7aaffdf..155e306fd 100644
--- a/applications/luci-app-opkg/po/templates/opkg.pot
+++ b/applications/luci-app-opkg/po/templates/opkg.pot
@@ -1,19 +1,19 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -21,269 +21,269 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 msgid "Loading configuration data…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 msgid "No packages"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 msgid "Not available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 msgid "OPKG Configuration"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/tr/opkg.po b/applications/luci-app-opkg/po/tr/opkg.po
index fe5e381fe..8ad039447 100644
--- a/applications/luci-app-opkg/po/tr/opkg.po
+++ b/applications/luci-app-opkg/po/tr/opkg.po
@@ -12,19 +12,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.1.1\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Eylemler"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Kullanılabilir"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -32,274 +32,274 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Vazgeç"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Açıklama"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "Reddet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Boş alan"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Yapılandırmaya dön"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Kullanılabilir Paketler"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "Toplam Mevcut"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Cihaz Yapılandırması"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Kaydet"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "Cihaz Yapılandırması"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Boyut"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Boyut (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Yazılım"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Versiyon"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/uk/opkg.po b/applications/luci-app-opkg/po/uk/opkg.po
index c1b262c0c..a9fe86612 100644
--- a/applications/luci-app-opkg/po/uk/opkg.po
+++ b/applications/luci-app-opkg/po/uk/opkg.po
@@ -9,19 +9,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Дії"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr "Автоматичне видалення невикористовуваних залежностей"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Доступно"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -34,75 +34,75 @@ msgstr ""
 "інших файлах може бути змінено, але вона зазвичай не зберігається при "
 "<em>оновленні системи</em>."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr "Очистити"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr "Налаштування opkg…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr "Залежності"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Опис"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr "Подробиці про пакет <em>%h</em>"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "Закрити"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr "Відображається %d-%d із %d"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Завантажити та інсталювати пакети"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr "Помилки"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr "Виконання менеджера пакетів"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Фільтр"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "Вільне місце"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Інсталювати"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr "Інстальовано"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
@@ -110,91 +110,91 @@ msgstr ""
 "Інсталяція пакетів з ненадійних джерел є потенційною загрозою безпеці! "
 "Дійсно спробувати інсталювати <em>%h</em>?"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr "Інсталювати…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 msgid "Loading configuration data…"
 msgstr "Завантаження даних конфігурації…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr "Завантаження інформації про пакети…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr "Інсталяція пакета вручну"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr "Потребує оновлення"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr "Наступна сторінка"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "Інформація відсутня"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 msgid "No packages"
 msgstr "Немає пакетів"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr "Немає пакетів, що відповідають \"<strong>%h</strong>\"."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 msgid "Not available"
 msgstr "Недоступно"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr "Не інстальовано"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 msgid "OPKG Configuration"
 msgstr "Конфігурація OPKG"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Назва пакета"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr "Назва пакета чи URL-адреса…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr "Попередня сторінка"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "Дійсно спробувати інсталювати <em>%h</em>?"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Видалити"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr "Видалити пакет <em>%h</em>"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr "Потрібно приблизно %.1024mB для інсталяції %d пакетів."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
@@ -202,48 +202,48 @@ msgstr ""
 "Потрібна версія %h %h,\n"
 "інстальовано %h"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 "Необхідний за залежністю пакет <em>%h</em> не доступний ні в одному "
 "репозиторії."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr "Потрібно оновити до %h %h"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Скинути"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Зберегти"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr "Збереження даних конфігурації…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Розмір"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "Розмір (.ipk)"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Програмне забезпечення"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr "Помилка виконання команди <em>opkg %h</em> з кодом <code>%d</code>."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
@@ -251,12 +251,12 @@ msgstr ""
 "Інстальована версія пакета <em>%h</em> несумісна, потрібно %s, а "
 "інстальовано %s."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 "Пакет <em>%h</em> не доступний ні в одному сконфігурованому репозиторії."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
@@ -264,50 +264,50 @@ msgstr ""
 "Версія пакету <em>%h</em> у репозиторії несумісна, потрібно %s, але доступна "
 "лише %s."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr "Введіть текст для фільтра…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr "Оновити списки…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr "Оновлення"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr "Оновлення…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Версія"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr "Несумісна версія"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "Очікуємо завершення виконання команди <em>opkg %h</em> …"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "невідомий"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr "~%.1024mB стиснуто"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB інстальовано"
diff --git a/applications/luci-app-opkg/po/vi/opkg.po b/applications/luci-app-opkg/po/vi/opkg.po
index c67f56fb7..42d631a97 100644
--- a/applications/luci-app-opkg/po/vi/opkg.po
+++ b/applications/luci-app-opkg/po/vi/opkg.po
@@ -12,19 +12,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "Hành động"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "Sẵn có"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -32,280 +32,280 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "Cấu hình"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "Mô tả"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "Tải và cài đặt gói"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "Lỗi"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "Lọc"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "Cài đặt "
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "Cài đặt "
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "Cài đặt "
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "Đi tới trang cấu hình thích hợp"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "Tải và cài đặt gói"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "Tìm gói"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "(%s available)"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "Cài đặt "
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "OK "
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "Cấu hình OPKG-"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "Tên gói"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "Tên gói"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "Loại bỏ"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "Reset"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "Lưu"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "Dung lượng "
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "Phần mềm"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "Phiên bản"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-opkg/po/zh-cn/opkg.po b/applications/luci-app-opkg/po/zh-cn/opkg.po
index 076ee49b6..2139eeb93 100644
--- a/applications/luci-app-opkg/po/zh-cn/opkg.po
+++ b/applications/luci-app-opkg/po/zh-cn/opkg.po
@@ -13,19 +13,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "动作"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr "自动移除未使用的依赖"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "可用"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -36,165 +36,165 @@ msgstr ""
 "置，<em>customfeeds.conf</em> 用于描述自定义仓库。其他配置文件的变更在系统升"
 "级时默认不被保留。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "取消"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr "清除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 msgid "Configure opkg…"
 msgstr "配置 opkg…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr "依赖"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "描述"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr "软件包 <em>%h</em> 详情"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr "解除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr "正在显示 %d-%d，共 %d"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "下载并安装软件包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 msgid "Errors"
 msgstr "错误"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr "正在执行软件包管理器"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "过滤器"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "空闲空间"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "安装"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 msgid "Installed"
 msgstr "已安装"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr "从未信任的源安装软件包有潜在的安全隐患！您确定要安装 <em>%h</em> 吗？"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 msgid "Install…"
 msgstr "安装…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 msgid "Loading configuration data…"
 msgstr "载入配置数据…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr "载入软件包信息…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 msgid "Manually install package"
 msgstr "手动安装软件包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr "需要升级"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr "下一页"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "无可用信息"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 msgid "No packages"
 msgstr "没有软件包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr "没有匹配“<strong>%h</strong>”的软件包。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 msgid "Not available"
 msgstr "不可用"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 msgid "Not installed"
 msgstr "未安装"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "确认"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 msgid "OPKG Configuration"
 msgstr "OPKG 配置"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "软件包名称"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 msgid "Package name or URL…"
 msgstr "软件包名称或 URL…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr "上一页"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr "真的要安装 <em>%h</em> 吗？"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "移除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr "移除软件包 <em>%h</em>"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr "需要大约 %.1024mB 空间来安装 %d 个软件包。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
@@ -202,105 +202,105 @@ msgstr ""
 "要求 %h %h 版本，\n"
 "已安装 %h"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr "依赖的软件包 <em>%h</em> 在所有仓库都未提供。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr "需要更新到 %h %h"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "复位"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "保存"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 msgid "Saving configuration data…"
 msgstr "正在保存配置数据…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "大小"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr "大小（.ipk）"
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "软件包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr "<em>opkg %h</em> 命令失败，代码 <code>%d</code>。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr "已安装的软件包 <em>%h</em> 版本不兼容，要求 %s 而 %s 已安装。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr "软件包 <em>%h</em> 在所有已配置的仓库中都不存在。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr "软件包 <em>%h</em> 在仓库中的版本不兼容，要求 %s 但仅可提供 %s。"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr "输入以过滤…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 msgid "Update lists…"
 msgstr "更新列表…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 msgid "Updates"
 msgstr "更新"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr "升级…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "版本"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr "版本不兼容"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "等待命令 <em>opkg %h</em> 执行完成…"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "未知"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr "~%.1024mB 已压缩"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr "~%.1024mB 已安装"
diff --git a/applications/luci-app-opkg/po/zh-tw/opkg.po b/applications/luci-app-opkg/po/zh-tw/opkg.po
index c2ea0348f..bd9a90bc2 100644
--- a/applications/luci-app-opkg/po/zh-tw/opkg.po
+++ b/applications/luci-app-opkg/po/zh-tw/opkg.po
@@ -11,19 +11,19 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.6\n"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:927
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:107
 msgid "Actions"
 msgstr "動作"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:795
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
 msgid "Automatically remove unused dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:935
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
 msgid "Available"
 msgstr "可用"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:725
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:641
 msgid ""
 "Below is a listing of the various configuration files used by <em>opkg</em>. "
 "Use <em>opkg.conf</em> for global settings and <em>customfeeds.conf</em> for "
@@ -31,284 +31,284 @@ msgid ""
 "changed but is usually not preserved by <em>sysupgrade</em>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:666
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:711
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:740
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:801
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:656
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:716
 msgid "Cancel"
 msgstr "取消"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:917
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
 msgid "Clear"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:930
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
 #, fuzzy
 msgid "Configure opkg…"
 msgstr "設定"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:643
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
 msgid "Dependencies"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:649
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:781
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:953
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:133
 msgid "Description"
 msgstr "描述"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:654
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
 msgid "Details for package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:851
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
 msgid "Dismiss"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:311
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
 msgid "Displaying %d-%d of %d"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:921
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
 msgid "Download and install package"
 msgstr "下載並安裝軟體包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:837
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:748
 #, fuzzy
 msgid "Errors"
 msgstr "錯誤"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:821
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
 msgid "Executing package manager"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:915
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
 msgid "Filter"
 msgstr "過濾器"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:908
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:88
 msgid "Free space"
 msgstr "剩餘空間"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:673
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:689
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:589
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:605
 msgid "Install"
 msgstr "安裝"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:262
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:470
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:936
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:178
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:386
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
 #, fuzzy
 msgid "Installed"
 msgstr "安裝"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:695
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
 msgid ""
 "Installing packages from untrusted sources is a potential security risk! "
 "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:251
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
 #, fuzzy
 msgid "Install…"
 msgstr "安裝"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:720
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
 #, fuzzy
 msgid "Loading configuration data…"
 msgstr "到相應設定頁"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:858
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
 msgid "Loading package information…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:705
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
 #, fuzzy
 msgid "Manually install package"
 msgstr "下載並安裝軟體包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:458
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
 msgid "Needs upgrade"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:944
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
 msgid "Next page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:324
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
 msgid "No information available"
 msgstr "尚無可運用資訊"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:312
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
 #, fuzzy
 msgid "No packages"
 msgstr "搜尋軟體包"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:328
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
 msgid "No packages matching \"<strong>%h</strong>\"."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:490
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
 #, fuzzy
 msgid "Not available"
 msgstr "全部可用"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:475
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
 #, fuzzy
 msgid "Not installed"
 msgstr "尚未連線"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:923
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
 msgid "OK"
 msgstr "行"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:719
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:751
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:761
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:635
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:667
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:676
 #, fuzzy
 msgid "OPKG Configuration"
 msgstr "OPKG-設定值"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:950
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:130
 msgid "Package name"
 msgstr "軟體包名稱"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:922
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
 #, fuzzy
 msgid "Package name or URL…"
 msgstr "軟體包名稱"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:942
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
 msgid "Previous page"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:702
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
 msgid "Really attempt to install <em>%h</em>?"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:241
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:808
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
 msgid "Remove"
 msgstr "移除"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:786
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
 msgid "Remove package <em>%h</em>"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:639
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
 msgid "Require approx. %.1024mB size for %d package(s) to install."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:465
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:483
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
 msgid ""
 "Require version %h %h,\n"
 "installed %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:488
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
 msgid ""
 "Required dependency package <em>%h</em> is not available in any repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:456
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
 msgid "Requires update to %h %h"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:329
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
 msgid "Reset"
 msgstr "重置"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:758
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:673
 msgid "Save"
 msgstr "保存"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:752
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:668
 #, fuzzy
 msgid "Saving configuration data…"
 msgstr "設定設備"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:657
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:789
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:573
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:704
 msgid "Size"
 msgstr "大小"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:952
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:132
 msgid "Size (.ipk)"
 msgstr ""
 
 #: applications/luci-app-opkg/luasrc/controller/opkg.lua:7
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:904
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:84
 msgid "Software"
 msgstr "軟體"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:842
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
 msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:461
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
 msgid ""
 "The installed version of package <em>%h</em> is not compatible, require %s "
 "while %s is installed."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:698
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
 msgid "The package <em>%h</em> is not available in any configured repository."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:478
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
 msgid ""
 "The repository version of package <em>%h</em> is not compatible, require %s "
 "but only %s is available."
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:916
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
 msgid "Type to filter…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:928
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
 #, fuzzy
 msgid "Update lists…"
 msgstr "上傳清單"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:937
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
 #, fuzzy
 msgid "Updates"
 msgstr "上傳清單"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:233
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:257
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
 msgid "Upgrade…"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:656
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:788
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:951
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:131
 msgid "Version"
 msgstr "版本"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:467
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:485
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
 msgid "Version incompatible"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:823
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
 #, fuzzy
 msgid "Waiting for the <em>opkg %h</em> command to complete…"
 msgstr "等待完整性指令..."
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:617
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:777
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:909
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
+#: applications/luci-app-opkg/luasrc/view/opkg.htm:89
 msgid "unknown"
 msgstr "未知"
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:615
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:775
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
 msgid "~%.1024mB compressed"
 msgstr ""
 
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:613
-#: applications/luci-app-opkg/luasrc/view/opkg.htm:773
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
+#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
 msgid "~%.1024mB installed"
 msgstr ""
diff --git a/applications/luci-app-radicale/po/de/radicale.po b/applications/luci-app-radicale/po/de/radicale.po
index 935a5c58a..68300a000 100644
--- a/applications/luci-app-radicale/po/de/radicale.po
+++ b/applications/luci-app-radicale/po/de/radicale.po
@@ -319,7 +319,7 @@ msgstr "Anzahl der Protokoll Backup Dateien, die angelegt werden."
 msgid "OPTIONAL: See python's ssl module for available ciphers"
 msgstr "OPTIONAL: Siehe Python SSL-Modul Dokumentation"
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr "Ein oder mehrere fehlende/ungültige Felder auf der Registerkarte"
 
diff --git a/applications/luci-app-radicale/po/pt-br/radicale.po b/applications/luci-app-radicale/po/pt-br/radicale.po
index a2626e184..0b3cc19db 100644
--- a/applications/luci-app-radicale/po/pt-br/radicale.po
+++ b/applications/luci-app-radicale/po/pt-br/radicale.po
@@ -317,7 +317,7 @@ msgid "OPTIONAL: See python's ssl module for available ciphers"
 msgstr ""
 "Opcional: veja o módulo SSL do python para conhecer as cifras disponíveis"
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr "Um ou campos inválidos/ausentes na aba"
 
diff --git a/applications/luci-app-radicale/po/ru/radicale.po b/applications/luci-app-radicale/po/ru/radicale.po
index 2069769b3..f3fe45248 100644
--- a/applications/luci-app-radicale/po/ru/radicale.po
+++ b/applications/luci-app-radicale/po/ru/radicale.po
@@ -320,7 +320,7 @@ msgstr ""
 "Необязательно: используйте SSL python модуль для применения доступных "
 "алгоритмов шифрования."
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr "Одно или несколько отсутствующих/недопустимых полей на странице."
 
diff --git a/applications/luci-app-radicale/po/sv/radicale.po b/applications/luci-app-radicale/po/sv/radicale.po
index 2631921b8..f979b262e 100644
--- a/applications/luci-app-radicale/po/sv/radicale.po
+++ b/applications/luci-app-radicale/po/sv/radicale.po
@@ -297,7 +297,7 @@ msgstr ""
 msgid "OPTIONAL: See python's ssl module for available ciphers"
 msgstr "VALFRITT: Kolla in python's ssl-modul för tillgängliga chiffer"
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr ""
 
diff --git a/applications/luci-app-radicale/po/templates/radicale.pot b/applications/luci-app-radicale/po/templates/radicale.pot
index 1ae574ff3..3c5b7945d 100644
--- a/applications/luci-app-radicale/po/templates/radicale.pot
+++ b/applications/luci-app-radicale/po/templates/radicale.pot
@@ -285,7 +285,7 @@ msgstr ""
 msgid "OPTIONAL: See python's ssl module for available ciphers"
 msgstr ""
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr ""
 
diff --git a/applications/luci-app-radicale/po/zh-cn/radicale.po b/applications/luci-app-radicale/po/zh-cn/radicale.po
index 16a7a61a3..1e3d3feb6 100644
--- a/applications/luci-app-radicale/po/zh-cn/radicale.po
+++ b/applications/luci-app-radicale/po/zh-cn/radicale.po
@@ -301,7 +301,7 @@ msgstr "要创建的日志备份文件数。"
 msgid "OPTIONAL: See python's ssl module for available ciphers"
 msgstr "可选：请参阅 python 的 ssl 模块以获取可用的加密算法"
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr "选项卡上的一个或多个字段缺失/无效"
 
diff --git a/applications/luci-app-radicale/po/zh-tw/radicale.po b/applications/luci-app-radicale/po/zh-tw/radicale.po
index b9b3d5dd7..d6f64bb85 100644
--- a/applications/luci-app-radicale/po/zh-tw/radicale.po
+++ b/applications/luci-app-radicale/po/zh-tw/radicale.po
@@ -301,7 +301,7 @@ msgstr "要建立的日誌備份檔案數。"
 msgid "OPTIONAL: See python's ssl module for available ciphers"
 msgstr "可選：請參閱 python 的 ssl 模組以獲取可用的加密演算法"
 
-#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:51
+#: applications/luci-app-radicale/luasrc/view/radicale/tabmap_nsections.htm:50
 msgid "One or more missing/invalid fields on tab"
 msgstr "選項卡上的一個或多個欄位缺失/無效"
 
diff --git a/applications/luci-app-statistics/po/ca/statistics.po b/applications/luci-app-statistics/po/ca/statistics.po
index 397736e7a..d550facb2 100644
--- a/applications/luci-app-statistics/po/ca/statistics.po
+++ b/applications/luci-app-statistics/po/ca/statistics.po
@@ -201,8 +201,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1094,4 +1094,3 @@ msgstr "segons; múltiples separats per espais"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "interfícies de servidor"
-
diff --git a/applications/luci-app-statistics/po/cs/statistics.po b/applications/luci-app-statistics/po/cs/statistics.po
index b340acc9d..d9696c039 100644
--- a/applications/luci-app-statistics/po/cs/statistics.po
+++ b/applications/luci-app-statistics/po/cs/statistics.po
@@ -197,8 +197,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1078,4 +1078,3 @@ msgstr "sekundy, více hodnot oddělených mezerou"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "rozhraní serveru"
-
diff --git a/applications/luci-app-statistics/po/de/statistics.po b/applications/luci-app-statistics/po/de/statistics.po
index 346211c80..b7fe0a6c7 100644
--- a/applications/luci-app-statistics/po/de/statistics.po
+++ b/applications/luci-app-statistics/po/de/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1099,4 +1099,3 @@ msgstr "mehrere mit Leerzeichen trennen"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "Server-Schnittstellen"
-
diff --git a/applications/luci-app-statistics/po/el/statistics.po b/applications/luci-app-statistics/po/el/statistics.po
index cc87dc741..91854366c 100644
--- a/applications/luci-app-statistics/po/el/statistics.po
+++ b/applications/luci-app-statistics/po/el/statistics.po
@@ -201,8 +201,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1036,4 +1036,3 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr ""
-
diff --git a/applications/luci-app-statistics/po/en/statistics.po b/applications/luci-app-statistics/po/en/statistics.po
index eff0a5bbd..490cc81c0 100644
--- a/applications/luci-app-statistics/po/en/statistics.po
+++ b/applications/luci-app-statistics/po/en/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1081,4 +1081,3 @@ msgstr "seconds; multiple separated by space"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "server interfaces"
-
diff --git a/applications/luci-app-statistics/po/es/statistics.po b/applications/luci-app-statistics/po/es/statistics.po
index ab60bdb50..c8af36e1b 100644
--- a/applications/luci-app-statistics/po/es/statistics.po
+++ b/applications/luci-app-statistics/po/es/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1095,4 +1095,3 @@ msgstr "segundos (varios separados por espacio)"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "interfaces servidores"
-
diff --git a/applications/luci-app-statistics/po/fr/statistics.po b/applications/luci-app-statistics/po/fr/statistics.po
index e822cf08a..de8854865 100644
--- a/applications/luci-app-statistics/po/fr/statistics.po
+++ b/applications/luci-app-statistics/po/fr/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1088,4 +1088,3 @@ msgstr "En secondes ; séparer différentes valeurs par des espaces"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "Interfaces du serveur"
-
diff --git a/applications/luci-app-statistics/po/he/statistics.po b/applications/luci-app-statistics/po/he/statistics.po
index 8027a24b2..d841795f9 100644
--- a/applications/luci-app-statistics/po/he/statistics.po
+++ b/applications/luci-app-statistics/po/he/statistics.po
@@ -196,8 +196,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/hu/statistics.po b/applications/luci-app-statistics/po/hu/statistics.po
index 4c575f8cb..4288e9982 100644
--- a/applications/luci-app-statistics/po/hu/statistics.po
+++ b/applications/luci-app-statistics/po/hu/statistics.po
@@ -197,8 +197,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1080,4 +1080,3 @@ msgstr "másodpercek; több szóközzel elválasztott érték is megadható"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "kiszolgáló interfész"
-
diff --git a/applications/luci-app-statistics/po/it/statistics.po b/applications/luci-app-statistics/po/it/statistics.po
index ebfc45774..1faf71466 100644
--- a/applications/luci-app-statistics/po/it/statistics.po
+++ b/applications/luci-app-statistics/po/it/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/ja/statistics.po b/applications/luci-app-statistics/po/ja/statistics.po
index abc506d11..fcc59142f 100644
--- a/applications/luci-app-statistics/po/ja/statistics.po
+++ b/applications/luci-app-statistics/po/ja/statistics.po
@@ -198,8 +198,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/ms/statistics.po b/applications/luci-app-statistics/po/ms/statistics.po
index ed90858b2..9bef9db2a 100644
--- a/applications/luci-app-statistics/po/ms/statistics.po
+++ b/applications/luci-app-statistics/po/ms/statistics.po
@@ -193,8 +193,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/no/statistics.po b/applications/luci-app-statistics/po/no/statistics.po
index abb396938..cb2b557d0 100644
--- a/applications/luci-app-statistics/po/no/statistics.po
+++ b/applications/luci-app-statistics/po/no/statistics.po
@@ -190,8 +190,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1070,4 +1070,3 @@ msgstr "sekunder; flere adskilt med mellomrom"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "Server grensesnitt"
-
diff --git a/applications/luci-app-statistics/po/pl/statistics.po b/applications/luci-app-statistics/po/pl/statistics.po
index e99a76d16..0ad820f9d 100644
--- a/applications/luci-app-statistics/po/pl/statistics.po
+++ b/applications/luci-app-statistics/po/pl/statistics.po
@@ -200,8 +200,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1088,4 +1088,3 @@ msgstr "sekundy; wielokrotnie oddzielone spacją"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "interfejsy serwera"
-
diff --git a/applications/luci-app-statistics/po/pt-br/statistics.po b/applications/luci-app-statistics/po/pt-br/statistics.po
index 3a4773045..b5e5d5a3c 100644
--- a/applications/luci-app-statistics/po/pt-br/statistics.po
+++ b/applications/luci-app-statistics/po/pt-br/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/pt/statistics.po b/applications/luci-app-statistics/po/pt/statistics.po
index abbebcf37..dc033863c 100644
--- a/applications/luci-app-statistics/po/pt/statistics.po
+++ b/applications/luci-app-statistics/po/pt/statistics.po
@@ -199,8 +199,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1088,4 +1088,3 @@ msgstr "segundos; vários valores, separar com espaço"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "Interfaces do servidor"
-
diff --git a/applications/luci-app-statistics/po/ro/statistics.po b/applications/luci-app-statistics/po/ro/statistics.po
index 608bff8b4..371e887ac 100644
--- a/applications/luci-app-statistics/po/ro/statistics.po
+++ b/applications/luci-app-statistics/po/ro/statistics.po
@@ -200,8 +200,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/ru/statistics.po b/applications/luci-app-statistics/po/ru/statistics.po
index bf0c9aad5..6e7f1b55f 100644
--- a/applications/luci-app-statistics/po/ru/statistics.po
+++ b/applications/luci-app-statistics/po/ru/statistics.po
@@ -200,8 +200,8 @@ msgstr "Включить"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/sk/statistics.po b/applications/luci-app-statistics/po/sk/statistics.po
index 816a831fc..3b324d53e 100644
--- a/applications/luci-app-statistics/po/sk/statistics.po
+++ b/applications/luci-app-statistics/po/sk/statistics.po
@@ -191,8 +191,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/sv/statistics.po b/applications/luci-app-statistics/po/sv/statistics.po
index 89b3bc96b..e8c70e790 100644
--- a/applications/luci-app-statistics/po/sv/statistics.po
+++ b/applications/luci-app-statistics/po/sv/statistics.po
@@ -195,8 +195,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/templates/statistics.pot b/applications/luci-app-statistics/po/templates/statistics.pot
index 077177efa..625e31d9b 100644
--- a/applications/luci-app-statistics/po/templates/statistics.pot
+++ b/applications/luci-app-statistics/po/templates/statistics.pot
@@ -184,8 +184,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/tr/statistics.po b/applications/luci-app-statistics/po/tr/statistics.po
index 0b6bea253..26aba8e77 100644
--- a/applications/luci-app-statistics/po/tr/statistics.po
+++ b/applications/luci-app-statistics/po/tr/statistics.po
@@ -192,8 +192,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/uk/statistics.po b/applications/luci-app-statistics/po/uk/statistics.po
index 94c3a765c..f9cadc12c 100644
--- a/applications/luci-app-statistics/po/uk/statistics.po
+++ b/applications/luci-app-statistics/po/uk/statistics.po
@@ -197,8 +197,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/vi/statistics.po b/applications/luci-app-statistics/po/vi/statistics.po
index af80e196e..ccafdf739 100644
--- a/applications/luci-app-statistics/po/vi/statistics.po
+++ b/applications/luci-app-statistics/po/vi/statistics.po
@@ -200,8 +200,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
@@ -1085,4 +1085,3 @@ msgstr "giây; nhiều phân tách bởi khoảng trống"
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/network.lua:45
 msgid "server interfaces"
 msgstr "giao diện server"
-
diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po
index bbfd303b7..7bbd2d8b0 100644
--- a/applications/luci-app-statistics/po/zh-cn/statistics.po
+++ b/applications/luci-app-statistics/po/zh-cn/statistics.po
@@ -201,8 +201,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po
index 0448be872..634de0118 100644
--- a/applications/luci-app-statistics/po/zh-tw/statistics.po
+++ b/applications/luci-app-statistics/po/zh-tw/statistics.po
@@ -201,8 +201,8 @@ msgstr ""
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/contextswitch.lua:11
-#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua:12
+#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpufreq.lua:11
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/csv.lua:15
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:8
 #: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/df.lua:15
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 276f548fc..f9b02ae56 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -356,11 +356,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Afegeix"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -499,6 +499,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -620,7 +628,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -630,7 +638,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Assigna interfícies..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1181,6 +1189,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1373,7 +1385,7 @@ msgstr "Destí"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Dispositiu"
 
@@ -1927,6 +1939,12 @@ msgstr "Operacions a la memòria flaix"
 msgid "Flashing..."
 msgstr "Escrivint a la memòria flaix..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Força"
@@ -2116,6 +2134,10 @@ msgstr "Penja"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2227,8 +2249,8 @@ msgstr "Tallafocs IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Adreça IPv4"
 
@@ -2236,15 +2258,15 @@ msgstr "Adreça IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Difusió IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Passarel·la IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Màscara de xarxa IPv4"
 
@@ -2319,21 +2341,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Adreça IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Passarel·la IPv6"
 
@@ -2351,12 +2373,12 @@ msgstr "Prefix IPv6"
 msgid "IPv6 prefix length"
 msgstr "Longitud de prefix IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2760,7 +2782,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Enllaç actiu"
 
@@ -3250,6 +3272,10 @@ msgstr "Utilitats de xarxa"
 msgid "Network boot image"
 msgstr "Imatge d'inici de xarxa"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3407,7 +3433,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3427,7 +3453,7 @@ msgstr ""
 "Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"per "
 "exemple\">p.e.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3480,7 +3506,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3548,14 +3574,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3929,7 +3955,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4073,7 +4099,7 @@ msgstr "Reiniciant..."
 msgid "Reboots the operating system of your device"
 msgstr "Arranca de nou el sistema operatiu del teu dispositiu"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Recepció"
 
@@ -4715,7 +4741,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4731,6 +4757,10 @@ msgstr "Protocol de commutador"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5182,7 +5212,7 @@ msgstr "Transferència"
 msgid "Transmission Rate"
 msgstr "Taxa de transmissió"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmissió"
 
@@ -5201,7 +5231,7 @@ msgstr "Antena transmissora"
 msgid "Trigger"
 msgstr "Activador"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Mode d'activació"
 
@@ -5241,11 +5271,11 @@ msgstr "Només UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Dispositiu USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5416,7 +5446,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5445,7 +5475,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5633,6 +5663,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5815,7 +5865,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "inhabilita"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index a55110e34..9bc284ce3 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -355,11 +355,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Přidat"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -495,6 +495,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -616,7 +624,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -626,7 +634,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Přiřadit rozhraní..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1177,6 +1185,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1371,7 +1383,7 @@ msgstr "Cíl"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Zařízení"
 
@@ -1931,6 +1943,12 @@ msgstr "Operace nad flash pamětí"
 msgid "Flashing..."
 msgstr "Nahrávám..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Vynutit"
@@ -2118,6 +2136,10 @@ msgstr "Zavěsit"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2229,8 +2251,8 @@ msgstr "IPv4 firewall"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 adresa"
 
@@ -2238,15 +2260,15 @@ msgstr "IPv4 adresa"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4 brána"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4 maska sítě"
 
@@ -2321,21 +2343,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6 adresa"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6 brána"
 
@@ -2353,12 +2375,12 @@ msgstr "IPv6 prefix"
 msgid "IPv6 prefix length"
 msgstr "Délka IPv6 prefixu"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2764,7 +2786,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Odkaz na"
 
@@ -3261,6 +3283,10 @@ msgstr "Síťové nástroje"
 msgid "Network boot image"
 msgstr "Síťový bootovací obraz"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3418,7 +3444,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Vypnutí prodlevy"
 
@@ -3437,7 +3463,7 @@ msgstr ""
 "Area Network\">VLAN</abbr> zápis <samp>INTERFACE.VLANNR</samp> (<abbr title="
 "\"například\">např.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Zapnutí prodlevy"
 
@@ -3490,7 +3516,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3558,14 +3584,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Přepsat MAC adresu"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3943,7 +3969,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4090,7 +4116,7 @@ msgstr "Rebootuji..."
 msgid "Reboots the operating system of your device"
 msgstr "Rebootuje operační systém vašeho zařízení"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Přijmout"
 
@@ -4742,7 +4768,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4758,6 +4784,10 @@ msgstr "Směrovací protokol"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5214,7 +5244,7 @@ msgstr "Přenos"
 msgid "Transmission Rate"
 msgstr "Vysílací rychlost"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Přenos"
 
@@ -5233,7 +5263,7 @@ msgstr "Anténa vysílače"
 msgid "Trigger"
 msgstr "Spouštění"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Trigger mód"
 
@@ -5273,11 +5303,11 @@ msgstr "Pouze UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB zařízení"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5448,7 +5478,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5477,7 +5507,7 @@ msgid "Use default gateway"
 msgstr "Použít výchozí bránu"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5668,6 +5698,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5848,7 +5898,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "zakázat"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index ef7f2d3c7..b39871f73 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -357,11 +357,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr "IPv4-Adresse hinzufügen…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr "IPv6-Adresse hinzufügen…"
 
@@ -503,6 +503,14 @@ msgstr "Erlaubte IP-Adressen"
 msgid "Always announce default router"
 msgstr "Immer Defaultrouter ankündigen"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -631,7 +639,7 @@ msgstr ""
 msgid "Architecture"
 msgstr "Architektur"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -643,7 +651,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Schnittstellen zuweisen..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1219,6 +1227,10 @@ msgstr ""
 "System verbleiben. Um dies zu vermeiden, sollte zuerst auf "
 "Werkseinstellungen zurückgesetzt werden."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1411,7 +1423,7 @@ msgstr "Ziel"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Gerät"
 
@@ -1984,6 +1996,12 @@ msgstr "Flash-Operationen"
 msgid "Flashing..."
 msgstr "Firmware wird installiert..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Start erzwingen"
@@ -2177,6 +2195,10 @@ msgstr "Auflegen"
 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)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2287,8 +2309,8 @@ msgstr "IPv4 Firewall"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 Adresse"
 
@@ -2296,15 +2318,15 @@ msgstr "IPv4 Adresse"
 msgid "IPv4 assignment length"
 msgstr "IPv4 Zuweisungslänge"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4 Broadcast"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4 Gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4 Netzmaske"
 
@@ -2379,21 +2401,21 @@ msgstr "IPv6 ULA-Präfix"
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6 Adresse"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr "IPv6 Zuweisungshinweis"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "IPv6 Zuweisungslänge"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6 Gateway"
 
@@ -2411,12 +2433,12 @@ msgstr "IPv6 Präfix"
 msgid "IPv6 prefix length"
 msgstr "Länge des IPv6 Präfix"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr "Gerouteter IPv6-Präfix"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "IPv6 Endung"
 
@@ -2831,7 +2853,7 @@ msgstr "Verbindungsstatus"
 msgid "Line Uptime"
 msgstr "Verbindungsdauer"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Verbindung hergestellt"
 
@@ -3346,6 +3368,10 @@ msgstr "Netzwerk-Werkzeuge"
 msgid "Network boot image"
 msgstr "Netzwerk-Boot-Image"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "Netzwerkgerät ist nicht vorhanden"
@@ -3505,7 +3531,7 @@ msgstr "Chiffriertes Passwort"
 msgid "Obtain IPv6-Address"
 msgstr "IPv6-Adresse beziehen"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Verzögerung für Ausschalt-Zustand"
 
@@ -3525,7 +3551,7 @@ msgstr ""
 "können VLANs in der Notation SCHNITTSTELLE.VLANNR (z.B.: eth0.1) verwendet "
 "werden."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Verzögerung für Anschalt-Zustand"
 
@@ -3580,7 +3606,7 @@ msgstr ""
 "Optional. 32-Bit-Marke für ausgehende, verschlüsselte Pakete. Wert in "
 "hexadezimal mit führendem <code>0x</code> angeben."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3660,14 +3686,14 @@ msgid "Output Interface"
 msgstr "Ausgehende Schnittstelle"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "MAC-Adresse überschreiben"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -4051,7 +4077,7 @@ msgstr ""
 "eine Schlüsseldatei mit der Endung <code>.pub</code> in das Eingabefeld "
 "gezogen werden."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Zu diesem Gerät geroutetes öffentliches Präfix zur Weiterverteilung an "
@@ -4205,7 +4231,7 @@ msgstr "Das System wird neu gestartet..."
 msgid "Reboots the operating system of your device"
 msgstr "Startet das Betriebssystem des Routers neu."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Empfangen"
 
@@ -4883,7 +4909,7 @@ msgstr ""
 "Der Switch %q hat eine unbekannte Struktur, die VLAN Settings könnten "
 "unpassend sein."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr "Switch-Port-Maske"
 
@@ -4899,6 +4925,10 @@ msgstr "Wechsle Protokoll"
 msgid "Switch to CIDR list notation"
 msgstr "Auf CIDR-Listen-Notation wechseln"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5389,7 +5419,7 @@ msgstr "Transfer"
 msgid "Transmission Rate"
 msgstr "Übertragungsrate"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Senden"
 
@@ -5408,7 +5438,7 @@ msgstr "Sendeantenne"
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Auslösmechanismus"
 
@@ -5448,11 +5478,11 @@ msgstr "Nur UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB-Gerät"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "USB Anschlüsse"
 
@@ -5623,7 +5653,7 @@ msgid "Use builtin IPv6-management"
 msgstr "Eingebautes IPv6-Management nutzen"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5652,7 +5682,7 @@ msgid "Use default gateway"
 msgstr "Benutze Standard-Gateway"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5851,6 +5881,26 @@ msgstr ""
 "generiert werden. Wenn diese Option aktiviert ist, werden die nachfolgenden "
 "R0/R1-Schlüsseloptionen nicht verwendet."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Breite"
@@ -6036,7 +6086,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "deaktivieren"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index e49965b22..a208eea92 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -356,11 +356,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -502,6 +502,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -623,7 +631,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -633,7 +641,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1186,6 +1194,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1380,7 +1392,7 @@ msgstr "Προορισμός"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Συσκευή"
 
@@ -1944,6 +1956,12 @@ msgstr "Λειτουργίες φλασάρισματος"
 msgid "Flashing..."
 msgstr "Φλασάρεται..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Επιβολή"
@@ -2132,6 +2150,10 @@ msgstr "Κρέμασμα"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2243,8 +2265,8 @@ msgstr "IPv4 Τείχος Προστασίας"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Διεύθυνση IPv4"
 
@@ -2252,15 +2274,15 @@ msgstr "Διεύθυνση IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Πύλη IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Μάσκα IPv4"
 
@@ -2335,21 +2357,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Διεύθυνση IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Πύλη IPv6"
 
@@ -2367,12 +2389,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2780,7 +2802,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Αναμμένο με Ζεύξη"
 
@@ -3270,6 +3292,10 @@ msgstr "Εργαλεία Δικτύου"
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3427,7 +3453,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3447,7 +3473,7 @@ msgstr ""
 "Network\">VLAN</abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title="
 "\"παραδείγματος χάριν\">π.χ.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3500,7 +3526,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3568,14 +3594,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3950,7 +3976,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4094,7 +4120,7 @@ msgstr "Επανεκκίνηση..."
 msgid "Reboots the operating system of your device"
 msgstr "Επανεκκίνηση του λειτουργικού συστήματος της συσκευής σας"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Λήψη"
 
@@ -4739,7 +4765,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4755,6 +4781,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5187,7 +5217,7 @@ msgstr "Μεταφέρθηκαν"
 msgid "Transmission Rate"
 msgstr "Ρυθμός Εκπομπής"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Εκπομπή"
 
@@ -5206,7 +5236,7 @@ msgstr "Κεραία Εκπομπής"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5246,11 +5276,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Συσκευή USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5418,7 +5448,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5447,7 +5477,7 @@ msgid "Use default gateway"
 msgstr "Χρήση προεπιλεγμένης πύλης"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5633,6 +5663,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5814,7 +5864,7 @@ msgstr ""
 msgid "disable"
 msgstr "ανενεργό"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 7fc1ea816..02cc7a1fa 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -354,11 +354,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Add"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -493,6 +493,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -614,7 +622,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -624,7 +632,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Assign interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1174,6 +1182,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1369,7 +1381,7 @@ msgstr "Destination"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Device"
 
@@ -1921,6 +1933,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Force"
@@ -2108,6 +2126,10 @@ msgstr "Hang Up"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2218,8 +2240,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr ""
 
@@ -2227,15 +2249,15 @@ msgstr ""
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2310,21 +2332,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2342,12 +2364,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2750,7 +2772,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Link On"
 
@@ -3238,6 +3260,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3395,7 +3421,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3415,7 +3441,7 @@ msgstr ""
 "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
 "<samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3468,7 +3494,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3536,14 +3562,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3917,7 +3943,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4061,7 +4087,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Reboots the operating system of your device"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Receive"
 
@@ -4702,7 +4728,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4718,6 +4744,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5144,7 +5174,7 @@ msgstr "Transfer"
 msgid "Transmission Rate"
 msgstr "Transmission Rate"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmit"
 
@@ -5163,7 +5193,7 @@ msgstr "Transmitter Antenna"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5203,11 +5233,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5375,7 +5405,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5404,7 +5434,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5592,6 +5622,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5771,7 +5821,7 @@ msgstr ""
 msgid "disable"
 msgstr "disable"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 8420d9c49..092d49240 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -356,11 +356,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Añadir"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -499,6 +499,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -620,7 +628,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -630,7 +638,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Asigne interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1183,6 +1191,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1378,7 +1390,7 @@ msgstr "Destino"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -1939,6 +1951,12 @@ msgstr "Operaciones de grabado"
 msgid "Flashing..."
 msgstr "Grabando..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Forzar"
@@ -2129,6 +2147,10 @@ msgstr "Suspender"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2240,8 +2262,8 @@ msgstr "Cortafuegos IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Dirección IPv4"
 
@@ -2249,15 +2271,15 @@ msgstr "Dirección IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Propagación IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Gateway IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Máscara de red IPv4"
 
@@ -2332,21 +2354,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Dirección IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Gateway IPv6"
 
@@ -2364,12 +2386,12 @@ msgstr "Prefijo IPv6"
 msgid "IPv6 prefix length"
 msgstr "Longitud de prefijo IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2780,7 +2802,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Enlace activado"
 
@@ -3277,6 +3299,10 @@ msgstr "Utilidades de red"
 msgid "Network boot image"
 msgstr "Imagen de arranque en red"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3434,7 +3460,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Retraso de desconexión"
 
@@ -3453,7 +3479,7 @@ msgstr ""
 "<abbr title=\"Virtual Local Area Network\">VLAN</abbr>, <samp>INTERFACE."
 "VLANNR</samp> (<abbr title=\"por ejemplo\">Ej.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Retraso de activación"
 
@@ -3506,7 +3532,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3574,14 +3600,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Ignorar dirección MAC"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3959,7 +3985,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4106,7 +4132,7 @@ msgstr "Rearrancando..."
 msgid "Reboots the operating system of your device"
 msgstr "Rearranque el sistema operativo de su dispositivo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Recibir"
 
@@ -4762,7 +4788,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4778,6 +4804,10 @@ msgstr "Intercambiar protocolo"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5242,7 +5272,7 @@ msgstr "Transferencia"
 msgid "Transmission Rate"
 msgstr "Tasa de Transmisión"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmitir"
 
@@ -5261,7 +5291,7 @@ msgstr "Antena Transmisora"
 msgid "Trigger"
 msgstr "Disparador"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Modo de disparador"
 
@@ -5301,11 +5331,11 @@ msgstr "Sólo UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Dispositivo USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5476,7 +5506,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5505,7 +5535,7 @@ msgid "Use default gateway"
 msgstr "Usar pasarela por defecto"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5697,6 +5727,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5878,7 +5928,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "desabilitar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index cbfca0045..3c3fa7d30 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -359,11 +359,11 @@ msgstr "Ad-hoc"
 msgid "Add"
 msgstr "Ajouter"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -505,6 +505,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -626,7 +634,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -636,7 +644,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Affecte les interfaces…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1189,6 +1197,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1384,7 +1396,7 @@ msgstr "Destination"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Équipement"
 
@@ -1950,6 +1962,12 @@ msgstr "Opérations d'écriture"
 msgid "Flashing..."
 msgstr "Écriture…"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Forcer"
@@ -2139,6 +2157,10 @@ msgstr "Signal (HUP)"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2249,8 +2271,8 @@ msgstr "Pare-feu IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Adresse IPv4"
 
@@ -2258,15 +2280,15 @@ msgstr "Adresse IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Diffusion IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Passerelle IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Masque-réseau IPv4"
 
@@ -2341,21 +2363,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Adresse IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Passerelle IPv6"
 
@@ -2373,12 +2395,12 @@ msgstr "Préfixe IPv6"
 msgid "IPv6 prefix length"
 msgstr "longueur du préfixe IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2788,7 +2810,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Lien établi"
 
@@ -3288,6 +3310,10 @@ msgstr "Utilitaires réseau"
 msgid "Network boot image"
 msgstr "Image de démarrage réseau"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3445,7 +3471,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Durée éteinte"
 
@@ -3463,7 +3489,7 @@ msgstr ""
 "\" et en saisissant les noms des interfaces réseau séparées par des espaces. "
 "Vous pouvez aussi utiliser la notation VLAN, INTERFACE.VLANNB (ex : eth0.1)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Durée allumée"
 
@@ -3516,7 +3542,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3584,14 +3610,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Modifier l'adresse MAC"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3969,7 +3995,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4115,7 +4141,7 @@ msgstr "Redémarre…"
 msgid "Reboots the operating system of your device"
 msgstr "Redémarrage du système d'exploitation de votre équipement"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Reçoit"
 
@@ -4770,7 +4796,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4786,6 +4812,10 @@ msgstr "Protocole du commutateur"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5257,7 +5287,7 @@ msgstr "Transfert"
 msgid "Transmission Rate"
 msgstr "Débit d'émission"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmet"
 
@@ -5276,7 +5306,7 @@ msgstr "Antenne émettrice"
 msgid "Trigger"
 msgstr "Déclenchement"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Mode de déclenchement"
 
@@ -5316,11 +5346,11 @@ msgstr "seulement UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Périphérique USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5492,7 +5522,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5521,7 +5551,7 @@ msgid "Use default gateway"
 msgstr "Utiliser la passerelle par défaut"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5713,6 +5743,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5895,7 +5945,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "désactiver"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 148a41577..37c552e7d 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -349,11 +349,11 @@ msgstr "אד-הוק"
 msgid "Add"
 msgstr "הוסף"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -492,6 +492,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -615,7 +623,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -625,7 +633,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "הקצה ממשקים"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1168,6 +1176,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1362,7 +1374,7 @@ msgstr "יעד"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "מכשיר"
 
@@ -1907,6 +1919,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr ""
@@ -2094,6 +2112,10 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2202,8 +2224,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "כתבות IPv4"
 
@@ -2211,15 +2233,15 @@ msgstr "כתבות IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2294,21 +2316,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2326,12 +2348,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2726,7 +2748,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr ""
 
@@ -3212,6 +3234,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3369,7 +3395,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3383,7 +3409,7 @@ msgid ""
 "<samp>eth0.1</samp>)."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3436,7 +3462,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3504,14 +3530,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3885,7 +3911,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4027,7 +4053,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr ""
 
@@ -4672,7 +4698,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4688,6 +4714,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5097,7 +5127,7 @@ msgstr "העברה"
 msgid "Transmission Rate"
 msgstr "קצב שידור"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "שידור"
 
@@ -5116,7 +5146,7 @@ msgstr "אנטנת שידור"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5156,11 +5186,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5328,7 +5358,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5357,7 +5387,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5543,6 +5573,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5719,7 +5769,7 @@ msgstr ""
 msgid "disable"
 msgstr "בטל"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 7e8ccdf17..044962498 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -354,11 +354,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -498,6 +498,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -619,7 +627,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -629,7 +637,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Interfészek összekapcsolása..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1184,6 +1192,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1378,7 +1390,7 @@ msgstr "Cél"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Eszköz"
 
@@ -1939,6 +1951,12 @@ msgstr "Flash műveletek"
 msgid "Flashing..."
 msgstr "Flash-elés..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Kényszerítés"
@@ -2128,6 +2146,10 @@ msgstr "Befejezés"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2238,8 +2260,8 @@ msgstr "IPv4 tűzfal"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 cím"
 
@@ -2247,15 +2269,15 @@ msgstr "IPv4 cím"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4 broadcast"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4 átjáró"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4 hálózati maszk"
 
@@ -2330,21 +2352,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6 cím"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6 átjáró"
 
@@ -2362,12 +2384,12 @@ msgstr "IPv6 előtag"
 msgid "IPv6 prefix length"
 msgstr "IPv6 prefix hossz"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2777,7 +2799,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Kapcsolat létrehozva"
 
@@ -3277,6 +3299,10 @@ msgstr "Hálózati eszközök"
 msgid "Network boot image"
 msgstr "Hálózati rendszertöltő lemezkép"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3434,7 +3460,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Kikapcsolt állapot késleltetés"
 
@@ -3453,7 +3479,7 @@ msgstr ""
 "<abbr title=\"Virtual Local Area Network\">VLAN</abbr> jelölés "
 "<samp>INTERFÉSZ.VLANSZÁM</samp> használatára is, pl. <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Bekapcsolt állapot késleltetés"
 
@@ -3506,7 +3532,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3574,14 +3600,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "MAC cím felülbírálása"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3959,7 +3985,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4106,7 +4132,7 @@ msgstr "Újraindítás..."
 msgid "Reboots the operating system of your device"
 msgstr "Újraindítja az eszköz operációs rendszerét"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Fogadás"
 
@@ -4761,7 +4787,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4777,6 +4803,10 @@ msgstr "Protokoll csere"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5245,7 +5275,7 @@ msgstr "Átvitel"
 msgid "Transmission Rate"
 msgstr "Átviteli sebesség"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Küldés"
 
@@ -5264,7 +5294,7 @@ msgstr "Adó antenna"
 msgid "Trigger"
 msgstr "Trigger"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Trigger mód"
 
@@ -5304,11 +5334,11 @@ msgstr "Csak UTMS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB eszköz"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5479,7 +5509,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5508,7 +5538,7 @@ msgid "Use default gateway"
 msgstr "Alapértelmezett átjáró használata"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5700,6 +5730,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5882,7 +5932,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "letiltás"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index aac634b27..ce7e44ead 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -363,11 +363,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -507,6 +507,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -628,7 +636,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -638,7 +646,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Assegna Interfacce..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1190,6 +1198,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1385,7 +1397,7 @@ msgstr "Destinazione"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -1944,6 +1956,12 @@ msgstr "Operazioni Flash"
 msgid "Flashing..."
 msgstr "Flashing..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Forza"
@@ -2133,6 +2151,10 @@ msgstr "Hangup"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2244,8 +2266,8 @@ msgstr "IPv4 Firewall"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Indirizzi IPv4"
 
@@ -2253,15 +2275,15 @@ msgstr "Indirizzi IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "trasmissione IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Gateway IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Maschera rete IPv4"
 
@@ -2336,21 +2358,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Indirizzi IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Gateway IPv6"
 
@@ -2368,12 +2390,12 @@ msgstr "Prefisso IPv6"
 msgid "IPv6 prefix length"
 msgstr "Lunghezza prefisso IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "Suffisso IPv6"
 
@@ -2782,7 +2804,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Collegamento on"
 
@@ -3278,6 +3300,10 @@ msgstr "Utilità di Rete"
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3435,7 +3461,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3454,7 +3480,7 @@ msgstr ""
 "title=\"Virtual Local Area Network\">VLAN</abbr> <samp>INTERFACCIA.VLANNUM</"
 "samp> (<abbr title=\"per esempio\">e.s.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3507,7 +3533,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3575,14 +3601,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Sovrascrivi indirizzo MAC"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3958,7 +3984,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4105,7 +4131,7 @@ msgstr "Riavviando..."
 msgid "Reboots the operating system of your device"
 msgstr "Riavvia il sistema operativo del tuo dispositivo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Ricezione"
 
@@ -4758,7 +4784,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4774,6 +4800,10 @@ msgstr "Cambia protocollo"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5212,7 +5242,7 @@ msgstr ""
 msgid "Transmission Rate"
 msgstr "Velocità di transmissione"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Trasmissione"
 
@@ -5231,7 +5261,7 @@ msgstr "Antenna trasmettente"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5271,11 +5301,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Periferica USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "Porte USB"
 
@@ -5446,7 +5476,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5475,7 +5505,7 @@ msgid "Use default gateway"
 msgstr "Usa il gateway predefinito"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5669,6 +5699,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5852,7 +5902,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "disabilita"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index efeffddf7..092234c06 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -356,11 +356,11 @@ msgstr "アドホック"
 msgid "Add"
 msgstr "追加"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -497,6 +497,14 @@ msgstr "許可されるIP"
 msgid "Always announce default router"
 msgstr "常にデフォルト ルーターを通知する"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -622,7 +630,7 @@ msgstr "適用リクエストはステータス <code>%h</code> により失敗�
 msgid "Architecture"
 msgstr "アーキテクチャ"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -632,7 +640,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "インターフェースの割当て..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1200,6 +1208,10 @@ msgstr ""
 "カスタム ファイル（証明書, スクリプト）がシステムに残るかもしれません。これを"
 "防ぐには、まず最初に factory-reset を行います。"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1394,7 +1406,7 @@ msgstr "宛先"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "デバイス"
 
@@ -1961,6 +1973,12 @@ msgstr "更新機能"
 msgid "Flashing..."
 msgstr "更新中..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "強制"
@@ -2151,6 +2169,10 @@ msgstr "再起動"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2261,8 +2283,8 @@ msgstr "IPv4 ファイアウォール"
 msgid "IPv4 Upstream"
 msgstr "IPv4 アップストリーム"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 アドレス"
 
@@ -2270,15 +2292,15 @@ msgstr "IPv4 アドレス"
 msgid "IPv4 assignment length"
 msgstr "IPv4 割り当て長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4 ブロードキャスト"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4 ゲートウェイ"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4 ネットマスク"
 
@@ -2353,21 +2375,21 @@ msgstr "IPv6 ULA-プレフィクス"
 msgid "IPv6 Upstream"
 msgstr "IPv6 アップストリーム"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6 アドレス"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "IPv6 割り当て長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6 ゲートウェイ"
 
@@ -2385,12 +2407,12 @@ msgstr "IPv6 プレフィクス"
 msgid "IPv6 prefix length"
 msgstr "IPv6 プレフィクス長"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "IPv6 サフィックス"
 
@@ -2802,7 +2824,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "リンクオン"
 
@@ -3304,6 +3326,10 @@ msgstr "ネットワーク ユーティリティ"
 msgid "Network boot image"
 msgstr "ネットワークブート用イメージ"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "ネットワーク デバイスが存在しません"
@@ -3463,7 +3489,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "消灯時間"
 
@@ -3483,7 +3509,7 @@ msgstr ""
 "\"Virtual Local Area Network\">VLAN</abbr>も使用することが出来ます。(<abbr "
 "title=\"for example\">例</abbr>: <samp>eth0.1</samp>)"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "点灯時間"
 
@@ -3536,7 +3562,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3608,14 +3634,14 @@ msgid "Output Interface"
 msgstr "出力インターフェース"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "MACアドレスを上書きする"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3997,7 +4023,7 @@ msgstr ""
 "力欄に OpenSSH 互換の公開鍵（1行）を貼り付けるか、 <code>.pub</code> ファイル"
 "をドラッグしてください。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4150,7 +4176,7 @@ msgstr "再起動中..."
 msgid "Reboots the operating system of your device"
 msgstr "デバイスのオペレーティングシステムを再起動します。"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "受信"
 
@@ -4806,7 +4832,7 @@ msgstr ""
 "スイッチ %q は不明なトポロジを持っています - VLAN 設定は正確ではないかもしれ"
 "ません。"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr "スイッチポート マスク"
 
@@ -4822,6 +4848,10 @@ msgstr "プロトコルの切り替え"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5294,7 +5324,7 @@ msgstr "転送"
 msgid "Transmission Rate"
 msgstr "転送レート"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "送信"
 
@@ -5313,7 +5343,7 @@ msgstr "送信アンテナ"
 msgid "Trigger"
 msgstr "トリガー"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "トリガーモード"
 
@@ -5353,11 +5383,11 @@ msgstr "UMTSのみ"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USBデバイス"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "USB ポート"
 
@@ -5529,7 +5559,7 @@ msgid "Use builtin IPv6-management"
 msgstr "ビルトインのIPv6-マネジメントを使用する"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5558,7 +5588,7 @@ msgid "Use default gateway"
 msgstr "デフォルト ゲートウェイを使用する"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5751,6 +5781,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "帯域幅"
@@ -5934,7 +5984,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "無効"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index 835e16656..d60fd88dc 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -349,11 +349,11 @@ msgstr ""
 msgid "Add"
 msgstr "추가"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -487,6 +487,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -608,7 +616,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -618,7 +626,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1168,6 +1176,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1363,7 +1375,7 @@ msgstr ""
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr ""
 
@@ -1915,6 +1927,12 @@ msgstr "Flash 작업"
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "강제하기"
@@ -2102,6 +2120,10 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2211,8 +2233,8 @@ msgstr "IPv4 방화벽"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 주소"
 
@@ -2220,15 +2242,15 @@ msgstr "IPv4 주소"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2303,21 +2325,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2335,12 +2357,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2736,7 +2758,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr ""
 
@@ -3223,6 +3245,10 @@ msgstr "네트워크 유틸리티"
 msgid "Network boot image"
 msgstr "네트워크 boot 이미지"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3380,7 +3406,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3400,7 +3426,7 @@ msgstr ""
 "(<abbr title=\"for example\">예</abbr>: <samp>eth0.1</samp>) 를 사용하실 수 "
 "있습니다."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3453,7 +3479,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3521,14 +3547,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "MAC 주소 덮어쓰기"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3904,7 +3930,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4048,7 +4074,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "장치의 운영체제를 재부팅합니다"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr ""
 
@@ -4692,7 +4718,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4708,6 +4734,10 @@ msgstr "프로토콜 변경"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5136,7 +5166,7 @@ msgstr "전송량"
 msgid "Transmission Rate"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr ""
 
@@ -5155,7 +5185,7 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5195,11 +5225,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5370,7 +5400,7 @@ msgid "Use builtin IPv6-management"
 msgstr "자체 내장 IPv6-관리 기능 사용"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5399,7 +5429,7 @@ msgid "Use default gateway"
 msgstr "Default gateway 사용"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5590,6 +5620,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5770,7 +5820,7 @@ msgstr ""
 msgid "disable"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 3aa96ba10..5e1f47a4d 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -344,11 +344,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Tambah"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -482,6 +482,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -603,7 +611,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -613,7 +621,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1153,6 +1161,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1343,7 +1355,7 @@ msgstr "Tempat tujuan"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Alat"
 
@@ -1892,6 +1904,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Paksa"
@@ -2079,6 +2097,10 @@ msgstr "Menutup"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2189,8 +2211,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr ""
 
@@ -2198,15 +2220,15 @@ msgstr ""
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2281,21 +2303,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2313,12 +2335,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2722,7 +2744,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Link Pada"
 
@@ -3210,6 +3232,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3367,7 +3393,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3386,7 +3412,7 @@ msgstr ""
 "dengan ruang. Anda juga boleh menggunakan antara muka VLAN notasi. Seperti "
 "eth0.1."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3439,7 +3465,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3507,14 +3533,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3888,7 +3914,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4031,7 +4057,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Reboot sistem operasi peranti anda"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Menerima"
 
@@ -4672,7 +4698,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4688,6 +4714,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5115,7 +5145,7 @@ msgstr "Pemindahan"
 msgid "Transmission Rate"
 msgstr "Kelajuan Penghantaran"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Pancar"
 
@@ -5134,7 +5164,7 @@ msgstr "Antena Pemancar"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5174,11 +5204,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5346,7 +5376,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5375,7 +5405,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5563,6 +5593,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5739,7 +5789,7 @@ msgstr ""
 msgid "disable"
 msgstr "mematikan"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 16543c913..36c0f83c7 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -353,11 +353,11 @@ msgstr "Ad-Hoc (Uavhengig)"
 msgid "Add"
 msgstr "Legg til"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -491,6 +491,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -612,7 +620,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -622,7 +630,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Tilknytt grensesnitt..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1174,6 +1182,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1368,7 +1380,7 @@ msgstr "Destinasjon"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Enhet"
 
@@ -1927,6 +1939,12 @@ msgstr "Flash operasjoner"
 msgid "Flashing..."
 msgstr "Flasher..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Bruk"
@@ -2115,6 +2133,10 @@ msgstr "Slå av"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2226,8 +2248,8 @@ msgstr "IPv4 Brannmur"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 adresse"
 
@@ -2235,15 +2257,15 @@ msgstr "IPv4 adresse"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4 kringkasting"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4 gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4 nettmaske"
 
@@ -2318,21 +2340,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6 adresse"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6 gateway"
 
@@ -2350,12 +2372,12 @@ msgstr "IPv6 prefiks"
 msgid "IPv6 prefix length"
 msgstr "IPv6 prefikslengde"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2757,7 +2779,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Forbindelse"
 
@@ -3253,6 +3275,10 @@ msgstr "Nettverks Verktøy"
 msgid "Network boot image"
 msgstr "Nettverks boot image"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3410,7 +3436,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Forsinkelse ved tilstand Av"
 
@@ -3430,7 +3456,7 @@ msgstr ""
 "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for eksempel\">f.eks</abbr>: "
 "<samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Forsinkelse ved tilstand -På-"
 
@@ -3483,7 +3509,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3551,14 +3577,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Overstyr MAC adresse"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3936,7 +3962,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4082,7 +4108,7 @@ msgstr "Starter på nytt..."
 msgid "Reboots the operating system of your device"
 msgstr "Omstarter operativsystemet på enheten"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Motta"
 
@@ -4733,7 +4759,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4749,6 +4775,10 @@ msgstr "Svitsj protokoll"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5212,7 +5242,7 @@ msgstr "Overføring"
 msgid "Transmission Rate"
 msgstr "Overførings rate"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Sende"
 
@@ -5231,7 +5261,7 @@ msgstr "Sende Antenne"
 msgid "Trigger"
 msgstr "Utløser"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Utløsende Tilstand"
 
@@ -5271,11 +5301,11 @@ msgstr "Kun UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB Enhet"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5446,7 +5476,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5475,7 +5505,7 @@ msgid "Use default gateway"
 msgstr "Bruk standard gateway"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5667,6 +5697,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5849,7 +5899,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "Deaktiver"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 3214be8d4..5bdfb738f 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -363,11 +363,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Dodaj"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -505,6 +505,14 @@ msgstr "Dozwolone adresy IP"
 msgid "Always announce default router"
 msgstr "Zawsze rozgłaszaj domyślny router"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -630,7 +638,7 @@ msgstr ""
 msgid "Architecture"
 msgstr "Architektura"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -642,7 +650,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Przypisz interfejsy..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1204,6 +1212,10 @@ msgstr ""
 "Własne pliki (certyfikaty, skrypty) mogą pozostać w systemie. Aby zapobiec "
 "temu, wykonaj najpierw reset do ustawień fabrycznych"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1398,7 +1410,7 @@ msgstr "Przeznaczenie"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Urządzenie"
 
@@ -1966,6 +1978,12 @@ msgstr "Operacje aktualizacji"
 msgid "Flashing..."
 msgstr "Flashowanie..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Wymuś"
@@ -2156,6 +2174,10 @@ msgstr "Rozłącz"
 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)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2268,8 +2290,8 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr "Źródłowy IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Adres IPv4"
 
@@ -2277,15 +2299,15 @@ msgstr "Adres IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Brama IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Maska IPv4"
 
@@ -2360,21 +2382,21 @@ msgstr "IPv6 Prefiks-ULA"
 msgid "IPv6 Upstream"
 msgstr "Źródłowy IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Adres IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr "Wskazówka przypisania IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "Długość przydziału IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Brama IPv6"
 
@@ -2392,12 +2414,12 @@ msgstr "Prefiks IPv6"
 msgid "IPv6 prefix length"
 msgstr "Długość prefiksu IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "Sufiks IPv6"
 
@@ -2807,7 +2829,7 @@ msgstr "Stan linii"
 msgid "Line Uptime"
 msgstr "Czas działania linii"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Połączenie aktywne"
 
@@ -3306,6 +3328,10 @@ msgstr "Narzędzia sieciowe"
 msgid "Network boot image"
 msgstr "Sieciowy obraz startowy"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "Urządzenie sieciowe nie jest obecne"
@@ -3465,7 +3491,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr "Uzyskaj adres IPv6"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Zwłoka wyłączenia"
 
@@ -3484,7 +3510,7 @@ msgstr ""
 "\"Virtual Local Area Network\">VLAN`ów</abbr> <samp>INTERFACE.VLANNR</samp> "
 "(<abbr title=\"na przykład\">np.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Zwłoka włączenia"
 
@@ -3537,7 +3563,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3609,14 +3635,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Nadpisz adres MAC"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3994,7 +4020,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4145,7 +4171,7 @@ msgstr "Ponowne uruchamianie..."
 msgid "Reboots the operating system of your device"
 msgstr "Uruchamia ponownie system na twoim urządzeniu"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Odebrane"
 
@@ -4807,7 +4833,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4823,6 +4849,10 @@ msgstr "Protokół przełącznika"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5296,7 +5326,7 @@ msgstr "Transfer"
 msgid "Transmission Rate"
 msgstr "Prędkość transmisji"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Nadawanie"
 
@@ -5315,7 +5345,7 @@ msgstr "Antena nadajnika"
 msgid "Trigger"
 msgstr "Trigger"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Rodzaj Triggeru"
 
@@ -5355,11 +5385,11 @@ msgstr "Tylko UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Urządzenie USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "Porty USB"
 
@@ -5531,7 +5561,7 @@ msgid "Use builtin IPv6-management"
 msgstr "Skorzystaj z wbudowanego zarządzania protokołem IPv6"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5560,7 +5590,7 @@ msgid "Use default gateway"
 msgstr "Użyj domyślnej bramy"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5755,6 +5785,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Szerokość"
@@ -5940,7 +5990,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "wyłącz"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index 45cec3fdd..36e5c7161 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -377,11 +377,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Adicionar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -526,6 +526,14 @@ msgstr "Endereços IP autorizados"
 msgid "Always announce default router"
 msgstr "Sempre anuncie o roteador padrão"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -650,7 +658,7 @@ msgstr "Pedido para aplicar falhou com o estado <code>%h</code>"
 msgid "Architecture"
 msgstr "Arquitetura"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -662,7 +670,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Atribuir as interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1238,6 +1246,10 @@ msgstr ""
 "Arquivos personalizados (certificados, scripts) podem permanecer no sistema. "
 "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)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1435,7 +1447,7 @@ msgstr "Destino"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -2023,6 +2035,12 @@ msgstr "Operações na memória flash"
 msgid "Flashing..."
 msgstr "Gravando na flash..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Forçar"
@@ -2220,6 +2238,10 @@ msgstr ""
 "Erros de Código de Erro de Cabeçalho (<abbr title=\"Header Error Code\">HEC</"
 "abbr>)"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2336,8 +2358,8 @@ msgstr "Firewall para IPv4"
 msgid "IPv4 Upstream"
 msgstr "Enlace IPv4 Superior"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
@@ -2345,15 +2367,15 @@ msgstr "Endereço IPv4"
 msgid "IPv4 assignment length"
 msgstr "Tamanho da atribuição IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Roteador padrão IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Máscara de rede IPv4"
 
@@ -2430,21 +2452,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr "Enlace IPv6 Superior"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Endereço IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr "Sugestão de atribuição IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "Tamanho da atribuição IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Roteador padrão do IPv6"
 
@@ -2462,12 +2484,12 @@ msgstr "Prefixo IPv6"
 msgid "IPv6 prefix length"
 msgstr "Tamanho Prefixo IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr "Prefixo roteável IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "Sufixo IPv6"
 
@@ -2884,7 +2906,7 @@ msgstr "Estado da Linha"
 msgid "Line Uptime"
 msgstr "Tempo de Atividade da Linha"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Enlace Ativo"
 
@@ -3406,6 +3428,10 @@ msgstr "Utilitários de Rede"
 msgid "Network boot image"
 msgstr "Imagem de boot pela rede"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "O dispositivo de rede não está presente"
@@ -3567,7 +3593,7 @@ msgstr "Senha Ofuscada"
 msgid "Obtain IPv6-Address"
 msgstr "Obter Endereço IPv6"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Atraso no estado de desligado"
 
@@ -3587,7 +3613,7 @@ msgstr ""
 "abbr> <samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
 "<samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Atraso no estado de conexões"
 
@@ -3643,7 +3669,7 @@ msgstr ""
 "Opcional. Marca 32 bits dos pacotes cifrados que estão saindo. Entre valores "
 "em hexadecimal, começando com <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3722,14 +3748,14 @@ msgid "Output Interface"
 msgstr "Interface de Saída"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Sobrescrever o endereço MAC"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -4111,7 +4137,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Prefixo público roteado para este dispositivo para distribuição a seus "
@@ -4268,7 +4294,7 @@ msgstr "Reiniciando..."
 msgid "Reboots the operating system of your device"
 msgstr "Reinicia o sistema operacional do seu dispositivo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Receber"
 
@@ -4946,7 +4972,7 @@ msgstr ""
 "O Switch %q tem uma topologia desconhecida - as configurações de VLAN podem "
 "não ser precisas."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr "Máscara da porta do Switch"
 
@@ -4962,6 +4988,10 @@ msgstr "Trocar o protocolo"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5446,7 +5476,7 @@ msgstr "Transferências"
 msgid "Transmission Rate"
 msgstr "Taxa de Transmissão"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmitir"
 
@@ -5465,7 +5495,7 @@ msgstr "Antena de Transmissão"
 msgid "Trigger"
 msgstr "Disparo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Modo de disparo"
 
@@ -5505,11 +5535,11 @@ msgstr "UMTS somente"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Dispositivo USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "Portas USB"
 
@@ -5686,7 +5716,7 @@ msgid "Use builtin IPv6-management"
 msgstr "Use o gerenciamento do IPv6 embarcado"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5715,7 +5745,7 @@ msgid "Use default gateway"
 msgstr "Use o roteador padrão"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5910,6 +5940,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Largura"
@@ -6096,7 +6146,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "desativar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index 6e227c370..545514552 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -361,11 +361,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Adicionar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -504,6 +504,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -625,7 +633,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -635,7 +643,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Atribuir interfaces..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1187,6 +1195,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1382,7 +1394,7 @@ msgstr "Destino"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -1945,6 +1957,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr "A programar...."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Forçar"
@@ -2133,6 +2151,10 @@ msgstr "Suspender"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2246,8 +2268,8 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Endereço IPv4"
 
@@ -2255,15 +2277,15 @@ msgstr "Endereço IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Broadcast IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Gateway IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Máscara IPv4"
 
@@ -2338,21 +2360,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Endereço IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Gateway IPv6"
 
@@ -2370,12 +2392,12 @@ msgstr "Prefixo IPv6"
 msgid "IPv6 prefix length"
 msgstr "Comprimento do prefixo IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2780,7 +2802,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Link Ativo"
 
@@ -3276,6 +3298,10 @@ msgstr "Ferramentas de Rede"
 msgid "Network boot image"
 msgstr "Imagem de arranque via rede"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3433,7 +3459,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Atraso do Off-State"
 
@@ -3453,7 +3479,7 @@ msgstr ""
 "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"por exemplo\">ex.</abbr>: "
 "<samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Atraso do On-State"
 
@@ -3506,7 +3532,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3574,14 +3600,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3955,7 +3981,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4101,7 +4127,7 @@ msgstr "A reiniciar..."
 msgid "Reboots the operating system of your device"
 msgstr "Reinicia o seu dispositivo"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Receber"
 
@@ -4744,7 +4770,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4760,6 +4786,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5212,7 +5242,7 @@ msgstr "Transferências"
 msgid "Transmission Rate"
 msgstr "Taxa de Transmissão"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmitir"
 
@@ -5231,7 +5261,7 @@ msgstr "Antena de Transmissão"
 msgid "Trigger"
 msgstr "Trigger"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Modo de Trigger"
 
@@ -5271,11 +5301,11 @@ msgstr "Só UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Dispositivo USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5443,7 +5473,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5472,7 +5502,7 @@ msgid "Use default gateway"
 msgstr "Usar gateway pre-definida"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5660,6 +5690,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5843,7 +5893,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "desativar"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index c38d2d699..618428c36 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -350,11 +350,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Adauga"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -490,6 +490,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -611,7 +619,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -621,7 +629,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Inregistreaza interfetele"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1163,6 +1171,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1353,7 +1365,7 @@ msgstr "Destinatie"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Dispozitiv"
 
@@ -1898,6 +1910,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Forteaza"
@@ -2086,6 +2104,10 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2196,8 +2218,8 @@ msgstr "Firewall IPv4"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Adresa IPv4"
 
@@ -2205,15 +2227,15 @@ msgstr "Adresa IPv4"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2288,21 +2310,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Adresa IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2320,12 +2342,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2723,7 +2745,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr ""
 
@@ -3209,6 +3231,10 @@ msgstr "Utilitare de retea"
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3366,7 +3392,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3380,7 +3406,7 @@ msgid ""
 "<samp>eth0.1</samp>)."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3433,7 +3459,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3501,14 +3527,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3882,7 +3908,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4026,7 +4052,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Rebooteaza sistemul de operare al dispozitivului tau"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr ""
 
@@ -4666,7 +4692,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4682,6 +4708,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5091,7 +5121,7 @@ msgstr "Transfer"
 msgid "Transmission Rate"
 msgstr "Rata de transmitere"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr ""
 
@@ -5110,7 +5140,7 @@ msgstr "Antena de transmitere"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5150,11 +5180,11 @@ msgstr "Doar UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "Dispozitiv USB"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5322,7 +5352,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5351,7 +5381,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5539,6 +5569,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5715,7 +5765,7 @@ msgstr ""
 msgid "disable"
 msgstr "dezactiveaza"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 1c6b1690f..0beac0647 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -360,11 +360,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Добавить"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -509,6 +509,14 @@ msgstr "Разрешенные IP-адреса"
 msgid "Always announce default router"
 msgstr "Объявлять всегда, как маршрутизатор по умолчанию"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -634,7 +642,7 @@ msgstr "Ошибка <code>%h</code> запроса на применение"
 msgid "Architecture"
 msgstr "Архитектура"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -645,7 +653,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Назначить интерфейсы..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1224,6 +1232,10 @@ msgstr ""
 "Пользовательские файлы (сертификаты, скрипты) могут остаться в системе. "
 "Чтобы этого не произошло, выполните сначала сброс к заводским настройкам."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1419,7 +1431,7 @@ msgstr "Направление"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Устройство"
 
@@ -1989,6 +2001,12 @@ msgstr "Операции с прошивкой"
 msgid "Flashing..."
 msgstr "Прошивка..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Назначить"
@@ -2178,6 +2196,10 @@ msgstr "Перезапустить"
 msgid "Header Error Code Errors (HEC)"
 msgstr "Ошибки контроля ошибок заголовка (HEC)"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2288,8 +2310,8 @@ msgstr "Межсетевой экран IPv4"
 msgid "IPv4 Upstream"
 msgstr "Основной IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4-адрес"
 
@@ -2297,15 +2319,15 @@ msgstr "IPv4-адрес"
 msgid "IPv4 assignment length"
 msgstr "IPv4 assignment length"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Широковещательный IPv4-адрес"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4-адрес шлюза"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Маска сети IPv4"
 
@@ -2380,21 +2402,21 @@ msgstr "IPv6 ULA-Prefix"
 msgid "IPv6 Upstream"
 msgstr "Основной IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6-адрес"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr "IPv6 подсказка присвоения"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "IPv6 назначение длины"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6-адрес шлюза"
 
@@ -2412,12 +2434,12 @@ msgstr "Префикс IPv6"
 msgid "IPv6 prefix length"
 msgstr "Длина префикса IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr "IPv6 направление префикса"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "IPv6 суффикс"
 
@@ -2829,7 +2851,7 @@ msgstr "Состояние Линии"
 msgid "Line Uptime"
 msgstr "Время бесперебойной работы линии"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Подключение"
 
@@ -3342,6 +3364,10 @@ msgstr "Сетевые утилиты"
 msgid "Network boot image"
 msgstr "Образ системы для сетевой загрузки"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "Нет сетевого устройства"
@@ -3501,7 +3527,7 @@ msgstr "Obfuscated Password"
 msgid "Obtain IPv6-Address"
 msgstr "Получение IPv6-адреса"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Задержка выключенного состояния"
 
@@ -3521,7 +3547,7 @@ msgstr ""
 "обозначения вида <samp>ИНТЕРФЕЙС.НОМЕРVLAN</samp> (<abbr title=\"например"
 "\">напр.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Задержка включенного состояния"
 
@@ -3576,7 +3602,7 @@ msgstr ""
 "Необязательно. 32-разрядная метка для исходящих зашифрованных пакетов. "
 "Введите значение в шестнадцатеричной форме, начиная с <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3656,14 +3682,14 @@ msgid "Output Interface"
 msgstr "Исходящий интерфейс"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Назначить MAC-адрес"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -4045,7 +4071,7 @@ msgstr ""
 "загрузить новый публичный SSH ключ, вставьте строку публичного OpenSSH ключа "
 "или перетащите <code>.pub</code> файл в поле ввода ключа."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 "Публичный префикс, направляемый на это устройство для распространения среди "
@@ -4202,7 +4228,7 @@ msgid "Reboots the operating system of your device"
 msgstr ""
 "Программная перезагрузка вашего устройства, т.е. выполнить команду 'reboot'"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Приём"
 
@@ -4872,7 +4898,7 @@ msgstr ""
 "Коммутатор %q имеет неизвестную топологию — настройки VLAN не могут быть "
 "точными."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr "Изменить маску порта"
 
@@ -4888,6 +4914,10 @@ msgstr "Изменить протокол"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5364,7 +5394,7 @@ msgstr "Передача"
 msgid "Transmission Rate"
 msgstr "Скорость передачи"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Передача"
 
@@ -5383,7 +5413,7 @@ msgstr "Передающая антенна"
 msgid "Trigger"
 msgstr "Назначить"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Режим работы"
 
@@ -5423,11 +5453,11 @@ msgstr "Только UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB устройство"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "USB порты"
 
@@ -5599,7 +5629,7 @@ msgid "Use builtin IPv6-management"
 msgstr "Использовать встроенный IPv6-менеджмент"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5628,7 +5658,7 @@ msgid "Use default gateway"
 msgstr "Использовать шлюз по умолчанию"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5827,6 +5857,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Ширина"
@@ -6012,7 +6062,7 @@ msgstr "дБм"
 msgid "disable"
 msgstr "отключить"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 378e661c2..cad6615af 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -339,11 +339,11 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -477,6 +477,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -598,7 +606,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -608,7 +616,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1147,6 +1155,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1337,7 +1349,7 @@ msgstr ""
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr ""
 
@@ -1880,6 +1892,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr ""
@@ -2067,6 +2085,10 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2175,8 +2197,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr ""
 
@@ -2184,15 +2206,15 @@ msgstr ""
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2267,21 +2289,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2299,12 +2321,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2699,7 +2721,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr ""
 
@@ -3185,6 +3207,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3342,7 +3368,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3356,7 +3382,7 @@ msgid ""
 "<samp>eth0.1</samp>)."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3409,7 +3435,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3477,14 +3503,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3858,7 +3884,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4000,7 +4026,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr ""
 
@@ -4639,7 +4665,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4655,6 +4681,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5062,7 +5092,7 @@ msgstr ""
 msgid "Transmission Rate"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr ""
 
@@ -5081,7 +5111,7 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5121,11 +5151,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5293,7 +5323,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5322,7 +5352,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5508,6 +5538,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5684,7 +5734,7 @@ msgstr ""
 msgid "disable"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index b74b1da77..f880a21e2 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -346,11 +346,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Lägg till"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -487,6 +487,14 @@ msgstr "Tillåtna IP-adresser"
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -608,7 +616,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -618,7 +626,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Tilldela gränssnitten..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1160,6 +1168,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1350,7 +1362,7 @@ msgstr "Plats"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Enhet"
 
@@ -1899,6 +1911,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr "Skriver..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Tvinga"
@@ -2086,6 +2104,10 @@ msgstr "Lägg på"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2194,8 +2216,8 @@ msgstr "IPv4-brandvägg"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4-adress"
 
@@ -2203,15 +2225,15 @@ msgstr "IPv4-adress"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4-gateway"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4-nätmask"
 
@@ -2286,21 +2308,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6-adress"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6-gateway"
 
@@ -2318,12 +2340,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2718,7 +2740,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Länk På"
 
@@ -3205,6 +3227,10 @@ msgstr "Nätverksverktyg"
 msgid "Network boot image"
 msgstr "Uppstartsbild för nätverket"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3362,7 +3388,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3376,7 +3402,7 @@ msgid ""
 "<samp>eth0.1</samp>)."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3429,7 +3455,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3497,14 +3523,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3878,7 +3904,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4022,7 +4048,7 @@ msgstr "Startar om..."
 msgid "Reboots the operating system of your device"
 msgstr "Startar om din enhets operativsystem"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Ta emot"
 
@@ -4661,7 +4687,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4677,6 +4703,10 @@ msgstr "Byt protokoll"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5088,7 +5118,7 @@ msgstr "Överför"
 msgid "Transmission Rate"
 msgstr "Överföringshastighet"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Överför"
 
@@ -5107,7 +5137,7 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5147,11 +5177,11 @@ msgstr "Endast UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB-enhet"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "USB-portar"
 
@@ -5319,7 +5349,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5348,7 +5378,7 @@ msgid "Use default gateway"
 msgstr "Använd standard-gateway"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5535,6 +5565,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Bredd"
@@ -5716,7 +5766,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "stäng ner"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index 3c7cc7982..0ba42f2a1 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -331,11 +331,11 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -469,6 +469,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -590,7 +598,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -600,7 +608,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1139,6 +1147,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1329,7 +1341,7 @@ msgstr ""
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr ""
 
@@ -1872,6 +1884,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr ""
@@ -2059,6 +2077,10 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2167,8 +2189,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr ""
 
@@ -2176,15 +2198,15 @@ msgstr ""
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2259,21 +2281,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2291,12 +2313,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2691,7 +2713,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr ""
 
@@ -3177,6 +3199,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3334,7 +3360,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3348,7 +3374,7 @@ msgid ""
 "<samp>eth0.1</samp>)."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3401,7 +3427,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3469,14 +3495,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3850,7 +3876,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -3992,7 +4018,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr ""
 
@@ -4631,7 +4657,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4647,6 +4673,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5054,7 +5084,7 @@ msgstr ""
 msgid "Transmission Rate"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr ""
 
@@ -5073,7 +5103,7 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5113,11 +5143,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5285,7 +5315,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5314,7 +5344,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5500,6 +5530,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5676,7 +5726,7 @@ msgstr ""
 msgid "disable"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 22fc38726..472d43f80 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -350,11 +350,11 @@ msgstr ""
 msgid "Add"
 msgstr "Ekle"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -490,6 +490,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -611,7 +619,7 @@ msgstr ""
 msgid "Architecture"
 msgstr "Mimari"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -621,7 +629,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Arabirim ata..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1162,6 +1170,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1352,7 +1364,7 @@ msgstr "Hedef"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Cihaz"
 
@@ -1897,6 +1909,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr ""
@@ -2084,6 +2102,10 @@ msgstr ""
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2192,8 +2214,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr ""
 
@@ -2201,15 +2223,15 @@ msgstr ""
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2284,21 +2306,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2316,12 +2338,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2716,7 +2738,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr ""
 
@@ -3202,6 +3224,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3359,7 +3385,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3373,7 +3399,7 @@ msgid ""
 "<samp>eth0.1</samp>)."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3426,7 +3452,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3494,14 +3520,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3875,7 +3901,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4017,7 +4043,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr ""
 
@@ -4656,7 +4682,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4672,6 +4698,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5079,7 +5109,7 @@ msgstr ""
 msgid "Transmission Rate"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr ""
 
@@ -5098,7 +5128,7 @@ msgstr ""
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5138,11 +5168,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5310,7 +5340,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5339,7 +5369,7 @@ msgid "Use default gateway"
 msgstr "Varsayılan ağ geçidini kullan"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5525,6 +5555,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Genişlik"
@@ -5703,7 +5753,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "etkin değil"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index 3eea14133..38a857a80 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -373,11 +373,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Додати"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -520,6 +520,14 @@ msgstr "Дозволено IP-адреси"
 msgid "Always announce default router"
 msgstr "Завжди оголошувати типовим маршрутизатором"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -646,7 +654,7 @@ msgstr "Сталася помилка запиту на застосування
 msgid "Architecture"
 msgstr "Архітектура"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -658,7 +666,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "Призначення інтерфейсів..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1228,6 +1236,10 @@ msgstr ""
 "Користувацькі файли (сертифікати, скрипти) можуть залишитися в системі. Щоб "
 "запобігти цьому, спочатку виконайте скидання до заводських налаштувань."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1425,7 +1437,7 @@ msgstr "Призначення"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Пристрій"
 
@@ -1998,6 +2010,12 @@ msgstr "Операції прошивання"
 msgid "Flashing..."
 msgstr "Перепрошиваємо..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Примусово"
@@ -2187,6 +2205,10 @@ msgstr "Призупинити"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2299,8 +2321,8 @@ msgstr "Брандмауер IPv4"
 msgid "IPv4 Upstream"
 msgstr "Висхідне з’єднання IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "Адреса IPv4"
 
@@ -2308,15 +2330,15 @@ msgstr "Адреса IPv4"
 msgid "IPv4 assignment length"
 msgstr "Довжина присвоювання IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "Широкомовний IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "Шлюз IPv4"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "Маска мережі IPv4"
 
@@ -2393,21 +2415,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr "Висхідне з’єднання IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "Адреса IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr "Натяк призначення IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "Довжина призначення IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "Шлюз IPv6"
 
@@ -2425,12 +2447,12 @@ msgstr "Префікс IPv6"
 msgid "IPv6 prefix length"
 msgstr "Довжина префікса IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr "Надісланий префікс IPv6"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "Суфікс IPv6"
 
@@ -2845,7 +2867,7 @@ msgstr "Стан лінії"
 msgid "Line Uptime"
 msgstr "Час безперервної роботи лінії"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Зв’язок встановлено"
 
@@ -3364,6 +3386,10 @@ msgstr "Мережеві утиліти"
 msgid "Network boot image"
 msgstr "Образ для мережевого завантаження"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "Мережевий пристрій відсутній"
@@ -3521,7 +3547,7 @@ msgstr "Обфусований пароль"
 msgid "Obtain IPv6-Address"
 msgstr "Отримати IPv6-адресу"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "Затримка Off-State"
 
@@ -3541,7 +3567,7 @@ msgstr ""
 "віртуальна локальна комп’ютерна мережа\">VLAN</abbr>-позначення "
 "<samp>ІНТЕРФЕЙС.НОМЕР_VLAN</samp> (наприклад, <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "Затримка On-State"
 
@@ -3596,7 +3622,7 @@ msgstr ""
 "Необов’язково. 32-бітна мітка для вихідних зашифрованих пакетів. Введіть "
 "значення в шістнадцятковому форматі, починаючи з <code>0x</code>."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3677,14 +3703,14 @@ msgid "Output Interface"
 msgstr "Вихідний інтерфейс"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "Перевизначити MAC-адресу"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -4069,7 +4095,7 @@ msgstr ""
 "ключ, вставте сумісний із OpenSSH відкритий ключ або перетягніть файл <code>."
 "pub</code> у поле введення."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr "Публічний префікс надісланий на цей пристрій для поширення клієнтам."
 
@@ -4223,7 +4249,7 @@ msgstr "Перезавантаження..."
 msgid "Reboots the operating system of your device"
 msgstr "Перезавантажити операційну систему вашого пристрою"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Приймання"
 
@@ -4886,7 +4912,7 @@ msgstr ""
 "Комутатор %q має невідому топологію – параметри VLAN можуть бути "
 "неправильними."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr "Маска портів комутатора"
 
@@ -4902,6 +4928,10 @@ msgstr "Протокол комутатора"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5384,7 +5414,7 @@ msgstr "Передано"
 msgid "Transmission Rate"
 msgstr "Швидкість передавання"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Передавання"
 
@@ -5403,7 +5433,7 @@ msgstr "Антена передавача"
 msgid "Trigger"
 msgstr "Тригер"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "Режим запуску"
 
@@ -5443,11 +5473,11 @@ msgstr "Тільки UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB-пристрій"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "USB-порт"
 
@@ -5618,7 +5648,7 @@ msgid "Use builtin IPv6-management"
 msgstr "Використовувати вбудоване керування IPv6"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5647,7 +5677,7 @@ msgid "Use default gateway"
 msgstr "Використовувати типовий шлюз"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5843,6 +5873,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "Ширина"
@@ -6028,7 +6078,7 @@ msgstr "дБм"
 msgid "disable"
 msgstr "вимкнено"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index a1d3c50b8..dbb7ad8aa 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -345,11 +345,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "Thêm vào"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -483,6 +483,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -604,7 +612,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -614,7 +622,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1153,6 +1161,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1345,7 +1357,7 @@ msgstr "Điểm đến"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "Công cụ"
 
@@ -1897,6 +1909,12 @@ msgstr ""
 msgid "Flashing..."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "Force"
@@ -2084,6 +2102,10 @@ msgstr "Hang Up"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2194,8 +2216,8 @@ msgstr ""
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr ""
 
@@ -2203,15 +2225,15 @@ msgstr ""
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr ""
 
@@ -2286,21 +2308,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr ""
 
@@ -2318,12 +2340,12 @@ msgstr ""
 msgid "IPv6 prefix length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2726,7 +2748,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "Link On"
 
@@ -3214,6 +3236,10 @@ msgstr ""
 msgid "Network boot image"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3371,7 +3397,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr ""
 
@@ -3391,7 +3417,7 @@ msgstr ""
 "abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e."
 "g.</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr ""
 
@@ -3444,7 +3470,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3512,14 +3538,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3893,7 +3919,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4037,7 +4063,7 @@ msgstr ""
 msgid "Reboots the operating system of your device"
 msgstr "Reboots hệ điều hành của công cụ"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "Receive"
 
@@ -4678,7 +4704,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4694,6 +4720,10 @@ msgstr ""
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5116,7 +5146,7 @@ msgstr "Chuyển giao"
 msgid "Transmission Rate"
 msgstr "Truyền tải rate"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "Transmit"
 
@@ -5135,7 +5165,7 @@ msgstr "Máy phát Antenna"
 msgid "Trigger"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr ""
 
@@ -5175,11 +5205,11 @@ msgstr ""
 msgid "UMTS/GPRS/EV-DO"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5347,7 +5377,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5376,7 +5406,7 @@ msgid "Use default gateway"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5562,6 +5592,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5742,7 +5792,7 @@ msgstr ""
 msgid "disable"
 msgstr "Vô hiệu hóa"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index afba0e777..ac57c19da 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -353,11 +353,11 @@ msgstr "点对点 Ad-Hoc"
 msgid "Add"
 msgstr "添加"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr "添加 IPv4 地址…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr "添加 IPv6 地址…"
 
@@ -491,6 +491,14 @@ msgstr "允许的 IP"
 msgid "Always announce default router"
 msgstr "总是通告默认路由"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -613,7 +621,7 @@ msgstr "应用请求失败，状态 <code>%h</code>"
 msgid "Architecture"
 msgstr "架构"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -623,7 +631,7 @@ msgstr "将每个公共 IPv6 前缀的给定长度部分分配给此接口"
 msgid "Assign interfaces..."
 msgstr "分配接口…"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1174,6 +1182,10 @@ msgid ""
 msgstr ""
 "自定义文件（证书、脚本）会保留在系统上。若无需保留，请先执行恢复出厂设置。"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1366,7 +1378,7 @@ msgstr "目标地址"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "设备"
 
@@ -1919,6 +1931,12 @@ msgstr "刷新操作"
 msgid "Flashing..."
 msgstr "正在刷写…"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "强制"
@@ -2108,6 +2126,10 @@ msgstr "挂起"
 msgid "Header Error Code Errors (HEC)"
 msgstr "请求头错误代码错误（HEC）"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2216,8 +2238,8 @@ msgstr "IPv4 防火墙"
 msgid "IPv4 Upstream"
 msgstr "IPv4 上游"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4 地址"
 
@@ -2225,15 +2247,15 @@ msgstr "IPv4 地址"
 msgid "IPv4 assignment length"
 msgstr "分配 IPv4 长度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4 广播"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4 网关"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4 子网掩码"
 
@@ -2308,21 +2330,21 @@ msgstr "IPv6 ULA 前缀"
 msgid "IPv6 Upstream"
 msgstr "IPv6 上游"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6 地址"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr "IPv6 分配提示"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr "IPv6 分配长度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6 网关"
 
@@ -2340,12 +2362,12 @@ msgstr "IPv6 地址前缀"
 msgid "IPv6 prefix length"
 msgstr "IPv6 地址前缀长度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr "IPv6 路由前缀"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr "IPv6 后缀"
 
@@ -2746,7 +2768,7 @@ msgstr "线路状态"
 msgid "Line Uptime"
 msgstr "线路运行时间"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "活动链接"
 
@@ -3242,6 +3264,10 @@ msgstr "网络工具"
 msgid "Network boot image"
 msgstr "网络启动镜像"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr "网络设备不存在"
@@ -3399,7 +3425,7 @@ msgstr "混淆密码"
 msgid "Obtain IPv6-Address"
 msgstr "获取 IPv6 地址"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "关闭时间"
 
@@ -3417,7 +3443,7 @@ msgstr ""
 "Area Network\">VLAN</abbr> 记号 <samp>INTERFACE.VLANNR</samp>（例如："
 "<samp>eth0.1</samp>）。"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "通电时间"
 
@@ -3471,7 +3497,7 @@ msgid ""
 msgstr ""
 "可选，传出加密数据包的 32 位标记。请输入十六进制值，以 <code>0x</code> 开头。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3544,14 +3570,14 @@ msgid "Output Interface"
 msgstr "网络出口"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "重设 MAC 地址"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3927,7 +3953,7 @@ msgstr ""
 "与使用普通密码相比，公钥允许无密码 SSH 登录具有更高的安全性。要将新密钥上传到"
 "设备，请粘贴 OpenSSH 兼容的公钥行或将 <code>.pub</code> 文件拖到输入字段中。"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr "分配到此设备的公共前缀，用以分发到客户端。"
 
@@ -4075,7 +4101,7 @@ msgstr "正在重启…"
 msgid "Reboots the operating system of your device"
 msgstr "重启您设备上的系统"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "接收"
 
@@ -4726,7 +4752,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr "交换机 %q 具有未知的拓扑结构，VLAN 设置可能不正确。"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr "交换机端口掩码"
 
@@ -4742,6 +4768,10 @@ msgstr "切换协议"
 msgid "Switch to CIDR list notation"
 msgstr "切换到 CIDR 列表记法"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5176,7 +5206,7 @@ msgstr "传输"
 msgid "Transmission Rate"
 msgstr "传送速率"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "传送"
 
@@ -5195,7 +5225,7 @@ msgstr "传送天线"
 msgid "Trigger"
 msgstr "触发器"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "触发模式"
 
@@ -5235,11 +5265,11 @@ msgstr "仅 UMTS（WCDMA）"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB 设备"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr "USB 接口"
 
@@ -5409,7 +5439,7 @@ msgid "Use builtin IPv6-management"
 msgstr "使用内置的 IPv6 管理"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5438,7 +5468,7 @@ msgid "Use default gateway"
 msgstr "使用默认网关"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5633,6 +5663,26 @@ msgstr ""
 "使用 PSK 时，可以自动生成 PMK，因此以下 R0/R1 密钥选项不生效。若要使用 R0 和 "
 "R1 密钥则禁用此选项。"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr "频宽"
@@ -5813,7 +5863,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "禁用"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index a61c9bf91..3328c5337 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -348,11 +348,11 @@ msgstr "Ad-Hoc"
 msgid "Add"
 msgstr "增加"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:56
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
 msgid "Add IPv4 address…"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
 msgid "Add IPv6 address…"
 msgstr ""
 
@@ -486,6 +486,14 @@ msgstr ""
 msgid "Always announce default router"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
+msgid "Always off (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
+msgid "Always on (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
 msgid ""
 "Always use 40MHz channels even if the secondary channel overlaps. Using this "
@@ -607,7 +615,7 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:112
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:19
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -617,7 +625,7 @@ msgstr ""
 msgid "Assign interfaces..."
 msgstr "分配界面..."
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:118
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:124
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:24
 msgid ""
 "Assign prefix parts using this hexadecimal subprefix ID for this interface."
@@ -1162,6 +1170,10 @@ msgid ""
 "this, perform a factory-reset first."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
+msgid "Custom flash intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
@@ -1356,7 +1368,7 @@ msgstr "目的地"
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:253
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:86
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:40
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
 msgid "Device"
 msgstr "設備"
 
@@ -1908,6 +1920,12 @@ msgstr "執行更新"
 msgid "Flashing..."
 msgstr "更新中..."
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:58
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
+msgid "Flashmemory write access (%s)"
+msgstr ""
+
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
 msgid "Force"
 msgstr "強制"
@@ -2095,6 +2113,10 @@ msgstr "斷線"
 msgid "Header Error Code Errors (HEC)"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
+msgid "Heartbeat intervall (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
 msgid ""
 "Here you can configure the basic aspects of your device like its hostname or "
@@ -2203,8 +2225,8 @@ msgstr "IPv4防火牆"
 msgid "IPv4 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:53
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:78
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:57
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:84
 msgid "IPv4 address"
 msgstr "IPv4位址"
 
@@ -2212,15 +2234,15 @@ msgstr "IPv4位址"
 msgid "IPv4 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:98
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:104
 msgid "IPv4 broadcast"
 msgstr "IPv4廣播"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:94
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:100
 msgid "IPv4 gateway"
 msgstr "IPv4匝道器"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:86
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:92
 msgid "IPv4 netmask"
 msgstr "IPv4網路遮罩"
 
@@ -2295,21 +2317,21 @@ msgstr ""
 msgid "IPv6 Upstream"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:121
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
 msgid "IPv6 address"
 msgstr "IPv6位址"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:123
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:23
 msgid "IPv6 assignment hint"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:111
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:117
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:18
 msgid "IPv6 assignment length"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:127
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
 msgid "IPv6 gateway"
 msgstr "IPv6匝道器"
 
@@ -2327,12 +2349,12 @@ msgstr "IPv6字首"
 msgid "IPv6 prefix length"
 msgstr "IPv6字首長度"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:132
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:33
 msgid "IPv6 routed prefix"
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:137
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:143
 msgid "IPv6 suffix"
 msgstr ""
 
@@ -2732,7 +2754,7 @@ msgstr ""
 msgid "Line Uptime"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:88
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:118
 msgid "Link On"
 msgstr "鏈接"
 
@@ -3219,6 +3241,10 @@ msgstr "網路多項工具"
 msgid "Network boot image"
 msgstr "網路開機映像檔"
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+msgid "Network device activity (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/model/network.lua:33
 msgid "Network device is not present"
 msgstr ""
@@ -3376,7 +3402,7 @@ msgstr ""
 msgid "Obtain IPv6-Address"
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:84
 msgid "Off-State Delay"
 msgstr "關閉狀態延遲"
 
@@ -3394,7 +3420,7 @@ msgstr ""
 "Local Area Network\">VLAN</abbr> 符號<samp>INTERFACE.VLANNR</samp> (<abbr "
 "title=\"for example\">例.如</abbr>: <samp>eth0.1</samp>)."
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:51
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:81
 msgid "On-State Delay"
 msgstr "啟用狀態延遲"
 
@@ -3447,7 +3473,7 @@ msgid ""
 "starting with <code>0x</code>."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:138
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:144
 msgid ""
 "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or "
 "'::1:2'. When IPv6 prefix (like 'a:b:c:d::') is received from a delegating "
@@ -3515,14 +3541,14 @@ msgid "Output Interface"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:63
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:149
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:155
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:33
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:54
 msgid "Override MAC address"
 msgstr "覆蓋MAC位址"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:66
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:152
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
 #: protocols/luci-proto-hnet/luasrc/model/cbi/admin_network/proto_hnet.lua:35
 #: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:20
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:56
@@ -3896,7 +3922,7 @@ msgid ""
 "code> file into the input field."
 msgstr ""
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:133
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
 msgid "Public prefix routed to this device for distribution to clients."
 msgstr ""
 
@@ -4042,7 +4068,7 @@ msgstr "重開中..."
 msgid "Reboots the operating system of your device"
 msgstr "重啟您設備的作業系統"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:90
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:120
 msgid "Receive"
 msgstr "接收"
 
@@ -4686,7 +4712,7 @@ msgid ""
 "Switch %q has an unknown topology - the VLAN settings might not be accurate."
 msgstr ""
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:155
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:185
 msgid "Switch Port Mask"
 msgstr ""
 
@@ -4702,6 +4728,10 @@ msgstr "切換協定"
 msgid "Switch to CIDR list notation"
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
+msgid "Switchport activity (%s)"
+msgstr ""
+
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
 #: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
 msgid "Sync with browser"
@@ -5141,7 +5171,7 @@ msgstr "傳輸"
 msgid "Transmission Rate"
 msgstr "傳輸速率"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:89
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:119
 msgid "Transmit"
 msgstr "射頻"
 
@@ -5160,7 +5190,7 @@ msgstr "射頻天線"
 msgid "Trigger"
 msgstr "觸發"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:85
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:115
 msgid "Trigger Mode"
 msgstr "觸發模式"
 
@@ -5200,11 +5230,11 @@ msgstr "只用3G UMTS"
 msgid "UMTS/GPRS/EV-DO"
 msgstr "UMTS/GPRS/EV-DO"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:93
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:123
 msgid "USB Device"
 msgstr "USB設備"
 
-#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:114
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:144
 msgid "USB Ports"
 msgstr ""
 
@@ -5374,7 +5404,7 @@ msgid "Use builtin IPv6-management"
 msgstr ""
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:40
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:103
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:109
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:92
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_dhcpv6.lua:45
 #: protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua:101
@@ -5403,7 +5433,7 @@ msgid "Use default gateway"
 msgstr "使用預設匝道器"
 
 #: modules/luci-base/luasrc/model/cbi/admin_network/proto_dhcp.lua:48
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:158
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:164
 #: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:77
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:24
 #: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:88
@@ -5594,6 +5624,26 @@ msgid ""
 "key options."
 msgstr ""
 
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
+msgid "Wi-Fi activity (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
+msgid "Wi-Fi client association (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
+msgid "Wi-Fi data reception (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
+msgid "Wi-Fi data transmission (%s)"
+msgstr ""
+
+#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
+msgid "Wi-Fi on (%s)"
+msgstr ""
+
 #: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
 msgid "Width"
 msgstr ""
@@ -5772,7 +5822,7 @@ msgstr "dBm"
 msgid "disable"
 msgstr "關閉"
 
-#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:113
+#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:119
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:524
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:530
 #: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:536