i18n: sync translations

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
author: INAGAKI Hiroshi <musashino.open@gmail.com> 2019-07-13 15:50:53 +0900
committer: Yousong Zhou <yszhou4tech@gmail.com> 2019-07-13 19:23:18 +0800
commit: 19c4b71af42783bdd909bfb57b259437ea5b129d (patch)
tree: 86732e2591ac5112e6dee84ba4e27d28123da3be /applications/luci-app-olsr
parent: 48b61ca2c4f032f0629cb8b8c7248353643a6ae8 (diff)
26 files changed, 3224 insertions, 3224 deletions
diff --git a/applications/luci-app-olsr/po/ca/olsr.po b/applications/luci-app-olsr/po/ca/olsr.po
index ceaab4e0bb..4de94e1e04 100644
--- a/applications/luci-app-olsr/po/ca/olsr.po
+++ b/applications/luci-app-olsr/po/ca/olsr.po
@@ -27,23 +27,23 @@ msgstr "Nodes OLSR actius"
 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 ""
 
@@ -70,8 +70,8 @@ msgstr ""
 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 ""
 
@@ -113,31 +113,31 @@ msgstr ""
 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"
 
@@ -145,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 "
@@ -161,8 +161,8 @@ 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 ""
 
@@ -171,17 +171,17 @@ msgstr ""
 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"
 
@@ -199,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"
@@ -209,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"
 
@@ -228,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"
 
@@ -261,8 +261,8 @@ 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"
 
@@ -288,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"
 
@@ -314,26 +314,26 @@ msgstr ""
 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."
@@ -344,52 +344,52 @@ msgstr ""
 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. "
@@ -398,14 +398,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -414,10 +414,10 @@ msgstr ""
 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 "
@@ -425,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 ""
 
@@ -441,24 +441,24 @@ 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."
@@ -472,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."
@@ -509,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 "
@@ -540,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ç"
 
@@ -569,22 +569,22 @@ 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"
 
@@ -592,8 +592,8 @@ msgstr "Temps de validesa MID"
 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"
 
@@ -608,17 +608,17 @@ msgstr ""
 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 /"
@@ -635,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"
 
@@ -662,22 +662,22 @@ msgstr "Veïns"
 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 ""
 
@@ -702,21 +702,21 @@ 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"
 
@@ -773,35 +773,35 @@ msgstr "Visió de conjunt d'anuncis d'interfície múltiple coneguts"
 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/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"
@@ -863,8 +863,8 @@ 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"
 
@@ -880,15 +880,15 @@ msgstr ""
 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 ""
 
@@ -912,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 "
@@ -948,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 "
@@ -976,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"
 
@@ -987,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\"."
@@ -1003,13 +1003,13 @@ msgstr "No s'ha pogut connectar al dimoni OLSR"
 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"
 
@@ -1034,24 +1034,24 @@ msgstr ""
 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 "
@@ -1076,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"
 
diff --git a/applications/luci-app-olsr/po/cs/olsr.po b/applications/luci-app-olsr/po/cs/olsr.po
index 93e3715f94..fe7e41eee5 100644
--- a/applications/luci-app-olsr/po/cs/olsr.po
+++ b/applications/luci-app-olsr/po/cs/olsr.po
@@ -23,23 +23,23 @@ msgstr ""
 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 ""
 
@@ -66,8 +66,8 @@ msgstr ""
 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 ""
 
@@ -109,31 +109,31 @@ msgstr ""
 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"
 
@@ -141,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 "
@@ -157,8 +157,8 @@ 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 ""
 
@@ -167,17 +167,17 @@ msgstr ""
 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í"
 
@@ -195,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"
@@ -205,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 ""
 
@@ -223,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 ""
 
@@ -256,8 +256,8 @@ 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"
 
@@ -283,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"
 
@@ -309,26 +309,26 @@ msgstr ""
 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."
@@ -339,52 +339,52 @@ msgstr ""
 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. "
@@ -393,14 +393,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -409,10 +409,10 @@ msgstr ""
 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 "
@@ -420,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 ""
 
@@ -436,24 +436,24 @@ 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."
@@ -467,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."
@@ -504,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 "
@@ -535,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 ""
 
@@ -564,22 +564,22 @@ 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 ""
 
@@ -587,8 +587,8 @@ msgstr ""
 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"
 
@@ -603,17 +603,17 @@ msgstr ""
 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 /"
@@ -630,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 ""
 
@@ -657,22 +657,22 @@ msgstr "Sousedé"
 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 ""
 
@@ -696,21 +696,21 @@ 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 ""
 
@@ -767,35 +767,35 @@ msgstr ""
 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/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"
@@ -857,8 +857,8 @@ 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"
 
@@ -874,15 +874,15 @@ msgstr ""
 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 ""
 
@@ -906,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 "
@@ -942,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 "
@@ -970,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 ""
 
@@ -981,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\"."
@@ -997,13 +997,13 @@ msgstr ""
 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 ""
 
@@ -1028,24 +1028,24 @@ msgstr "Velmi dobré (SNR > 30)"
 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 "
@@ -1070,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 ""
 
diff --git a/applications/luci-app-olsr/po/de/olsr.po b/applications/luci-app-olsr/po/de/olsr.po
index d3271ff856..51cc1a84c4 100644
--- a/applications/luci-app-olsr/po/de/olsr.po
+++ b/applications/luci-app-olsr/po/de/olsr.po
@@ -25,23 +25,23 @@ msgstr "Aktive OLSR-Knoten"
 msgid "Active host net announcements"
 msgstr "Aktive HNA-Ankündigungen"
 
-#: 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 "Erweiterte Einstellungen"
 
-#: 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 "Gateways mit NAT erlauben"
 
-#: 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 "Auswahl von IPv4-Gateways erlauben, die zum Internet hin NAT verwenden"
 
-#: 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 "Uplink ankündigen"
 
@@ -69,8 +69,8 @@ msgstr ""
 msgid "Broadcast address"
 msgstr "Broadcast-Adresse"
 
-#: 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 ""
 
@@ -112,19 +112,19 @@ msgstr "Konfiguration herunterladen"
 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 "Aktivieren"
 
-#: 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\"."
@@ -132,13 +132,13 @@ msgstr ""
 "SmartGateway aktivieren. Ist diese Option deaktiviert, dann werden alle "
 "folgenden SmartGateway Einstellungen ignoriert. Der Defaultwert ist \"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 "Dieses Interface benutzen."
 
-#: 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 "Aktiviert"
 
@@ -146,13 +146,13 @@ msgstr "Aktiviert"
 msgid "Expected retransmission count"
 msgstr "Zu erwartende Sendeversuche pro Paket"
 
-#: 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-Metrik"
 
-#: 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 "
@@ -168,8 +168,8 @@ msgstr ""
 "aber nur, wenn sich auch der Nexthop verändert hat. Der Defaultwert ist "
 "\"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 Mechanismus für TC-Nachrichten (ausgewählt entspricht ein). Der "
@@ -180,17 +180,17 @@ msgstr ""
 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 "Allgemeine Einstellungen"
 
-#: 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 "Allgemeine Einstellungen"
 
@@ -208,8 +208,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"
@@ -218,17 +218,17 @@ msgstr "HNA"
 msgid "HNA Announcements"
 msgstr "HNA-Ankündigungen"
 
+#: 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-Intervall"
 
+#: 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-Gültigkeit"
 
@@ -237,22 +237,22 @@ msgstr "HNA-Gültigkeit"
 msgid "HNA6 Announcements"
 msgstr "HNA-Ankündigungen"
 
-#: 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-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 "Hello-Gültigkeit"
 
@@ -270,8 +270,8 @@ 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"
 
@@ -302,8 +302,8 @@ msgstr ""
 "Rechner in einem OLSR-geroutetem Netzwerk können Konnektivität zu externen "
 "Netzwerken mittels HNA-Nachrichten ankündigen."
 
-#: 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 "
@@ -314,10 +314,10 @@ msgstr ""
 "aber das Registrieren von Nachbarknoten. Der Defaultwert ist \"eingeschaltet"
 "\"."
 
+#: 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-Adressen"
 
@@ -334,13 +334,13 @@ msgstr ""
 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 "
@@ -350,13 +350,13 @@ msgstr ""
 "Beispiel ist 255.255.255.255. Der Defaultwert ist \"0.0.0.0\". Dies "
 "verwendet die Broadcastadresse des Interfaces."
 
-#: 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 Quell-IP"
 
-#: 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."
@@ -369,17 +369,17 @@ msgstr ""
 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."
@@ -387,25 +387,25 @@ msgstr ""
 "IPv6 Multicast-Adresse. Der Defaultwert ist \"FF02::6D\", die linklocal "
 "Multicastadresse für MANETs."
 
-#: 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 Netzwerk muss in 'full notation', der Prefix in CIDR Schreibweise "
 "eingegeben werden."
 
+#: 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 Quell-IP"
 
+#: 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 "
@@ -415,13 +415,13 @@ msgstr ""
 "angegebenen Prefix liegt. Der Defaultwert ist \"0::/0\", damit wird eine "
 "IPv6-Adresse des Interfaces verwendet die nicht linklocal ist."
 
-#: 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-Präfix des Uplinks"
 
-#: 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. "
@@ -436,16 +436,16 @@ msgstr ""
 "><b>ACHTUNG:</b> Diese Einstellung darf nicht zusammen mit der etx_ffeth "
 "Metrik verwendet werden!<br />Der Defaultwert ist \"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 ""
 "Benutzt dieser Knoten NAT für die Verbindung zum Internet? Der Defaultwert "
 "ist \"yes\"."
 
-#: 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -454,10 +454,10 @@ msgstr ""
 msgid "Interface"
 msgstr "Schnittstelle"
 
+#: 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 "
@@ -468,15 +468,15 @@ msgstr ""
 "\"ether\". Der Defaultwert ist \"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 "Schnittstellen"
 
-#: 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 "Schnittstellen-Standards"
 
@@ -484,8 +484,8 @@ msgstr "Schnittstellen-Standards"
 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\"."
@@ -493,17 +493,17 @@ msgstr ""
 "Intervall mit dem Netzwerkschnittstellen auf Änderungen in ihrer "
 "Konfiguration überprüft werden (in Sekunden). Der Defaultwert ist \"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."
@@ -517,30 +517,30 @@ msgstr "Bekannte OLSR-Routen"
 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-Alterung"
 
-#: 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-Algorithmus"
 
-#: 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."
@@ -554,20 +554,20 @@ msgstr "letzter Hop"
 msgid "Legend"
 msgstr "Legende"
 
-#: 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 "Bibliothek"
 
-#: 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 "Linkqualitätseinstellungen"
 
-#: 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. "
@@ -577,8 +577,8 @@ msgstr ""
 "verwendet werden. Kleinere Werte bedeuten, dass ETX-Werte sich langsamer "
 "verändern. Erlaubte Werte sind 0.01 bis 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 "
@@ -595,8 +595,8 @@ msgstr ""
 "Variante von etx_ff die Ethernetlinks mit ETX 0.1 erlaubt<br />Der Default "
 "ist \"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 "
@@ -606,10 +606,10 @@ msgstr ""
 "><b>0</b> = Linkquality nicht benutzen<br /><b>2</b> = Linkquality für die "
 "Wahl von MPRs und fürs Routing benutzen.<br />Der Defaultwert ist \"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-Multiplikator"
 
@@ -627,22 +627,22 @@ msgid "Local interface IP"
 msgstr "Lokale Interface-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-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 "MID-Gültigkeit"
 
@@ -650,8 +650,8 @@ msgstr "MID-Gültigkeit"
 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 "Haupt-IP"
 
@@ -666,17 +666,17 @@ msgstr ""
 msgid "Metric"
 msgstr "Metrik"
 
+#: 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 "Modus"
 
-#: 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 /"
@@ -698,8 +698,8 @@ msgstr ""
 "zu 192.168.0.1: 192.168.0.1 0.5<br />reduziere die LQ für alle Nodes die mit "
 "diesem Interface kommunizieren um 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-Schwellenwert"
 
@@ -725,22 +725,22 @@ msgstr "Nachbarn"
 msgid "Netmask"
 msgstr "Netzmaske"
 
+#: 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 "Netzwerk"
 
-#: 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 "Netzwerk-Adresse"
 
-#: 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 "Abfrageintervall für Schnittstellenänderungen"
 
@@ -765,21 +765,21 @@ msgstr "OLSR - HNA-Ankündigungen"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA-Ankündigungen"
 
-#: 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 "OLSR Daemon - Schnittstelle"
 
@@ -836,35 +836,35 @@ msgstr "Übersicht über bekannte Mehrfachschnittstellenmeldungen"
 msgid "Overview of smart gateways in this network"
 msgstr "Übersicht über Smart Gateways in diesem Netzwerk."
 
-#: 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 "Pluginkonfiguration"
 
 #: 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 "Abfragerate für OLSRd-Sockets in Sekunden. Der Defaultwert ist 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 "Abfragerate"
 
-#: 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/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"
@@ -937,8 +937,8 @@ 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 "Smart Gateway"
 
@@ -954,8 +954,8 @@ msgstr "Smart Gateway ist auf diesem System nicht konfiguriert."
 msgid "Source address"
 msgstr "Quell-IP"
 
-#: 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\"."
@@ -964,8 +964,8 @@ msgstr ""
 "Der erste Wert ist die Upload-, der zweite Wert die Downloadgeschwindigkeit. "
 "Der Defaultwert ist \"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 "Geschwindigkeit des Uplinks"
 
@@ -989,34 +989,34 @@ msgstr "Erfolgsquote vom Nachbarn empfangener Pakete"
 msgid "Success rate of packages sent to the neighbour"
 msgstr "Erfolgsquote zum Nachbarn gesendeter Pakete"
 
-#: 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 "TC-Gültigkeit"
 
-#: 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-Wert"
 
+#: 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 "
@@ -1028,8 +1028,8 @@ msgstr ""
 "erlaubt damit Mesh-Routing für jegliche Netzwerkgeräte. Besuche <a "
 "href='http://www.olsr.org'>olsrd.org</a> für Hilfe und Dokumentation."
 
-#: 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\"."
@@ -1038,13 +1038,13 @@ msgstr ""
 "dann wird der Bereitschaftswert automatisch anhand von Akkukapazität und "
 "Stromversorgung berechnet"
 
-#: 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 "Interface das OLSRd verwenden soll."
 
-#: 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."
@@ -1052,8 +1052,8 @@ msgstr ""
 "Port, den OLSRd benutzt. Dieser sollte in der Regel auf dem Defaultwert 698 "
 "bleiben, was dem von IANA zugewiesenen Port für OLSRd entspricht."
 
-#: 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 "
@@ -1065,10 +1065,10 @@ msgstr ""
 "Übersetzung der IPv6-Adresse zu benutzen. Die maximale erlaubte Länge des "
 "Präfix ist 64 bit. Der Defaultwert ist \"::/0\" (kein Präfix)."
 
+#: 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 "Taktung und Validität"
 
@@ -1076,8 +1076,8 @@ msgstr "Taktung und Validität"
 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\"."
@@ -1093,13 +1093,13 @@ msgstr "Es konnte keine Verbindung zum OLSR-Daemon hergestellt werden!"
 msgid "Uplink"
 msgstr "Upload-Bandbreite"
 
-#: 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 "Der Uplink benutzt 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 "Hysterese aktivieren"
 
@@ -1124,8 +1124,8 @@ msgstr ""
 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."
@@ -1133,17 +1133,17 @@ msgstr ""
 "WARNUNG: kmod-ipip ist nicht installiert. Ohne kmod-ipip wird SmartGateway "
 "nicht funktionieren!"
 
+#: 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 "Gewichtung"
 
+#: 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 "
@@ -1184,8 +1184,8 @@ msgstr ""
 "2000::/3). Der Defaultwert ist \"both\" (sowohl IPv4 als auch IPv6 Uplink "
 "ankündigen sofern verfügbar)."
 
-#: 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 "Bereitschaft"
 
diff --git a/applications/luci-app-olsr/po/el/olsr.po b/applications/luci-app-olsr/po/el/olsr.po
index 65850e30c0..de62fa4fcb 100644
--- a/applications/luci-app-olsr/po/el/olsr.po
+++ b/applications/luci-app-olsr/po/el/olsr.po
@@ -25,23 +25,23 @@ msgstr "Ενεργοί κόμβοι OLSR"
 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 ""
 
@@ -68,8 +68,8 @@ msgstr ""
 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 ""
 
@@ -111,31 +111,31 @@ msgstr ""
 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 ""
 
@@ -143,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 "
@@ -159,8 +159,8 @@ 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 ""
 
@@ -169,17 +169,17 @@ msgstr ""
 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 "Γενικές ρυθμίσεις"
 
@@ -197,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"
@@ -207,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 ""
 
@@ -225,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 ""
 
@@ -258,8 +258,8 @@ 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 ""
 
@@ -285,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"
 
@@ -311,26 +311,26 @@ msgstr ""
 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."
@@ -341,52 +341,52 @@ msgstr ""
 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. "
@@ -395,14 +395,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -411,10 +411,10 @@ msgstr ""
 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 "
@@ -422,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 ""
 
@@ -438,24 +438,24 @@ 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."
@@ -469,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."
@@ -506,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 "
@@ -537,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 ""
 
@@ -566,22 +566,22 @@ 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 ""
 
@@ -589,8 +589,8 @@ msgstr ""
 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 ""
 
@@ -605,17 +605,17 @@ msgstr ""
 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 /"
@@ -632,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 ""
 
@@ -659,22 +659,22 @@ msgstr ""
 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 ""
 
@@ -698,21 +698,21 @@ 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 Δαίμονας - Διεπαφή"
 
@@ -769,35 +769,35 @@ msgstr ""
 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/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"
@@ -859,8 +859,8 @@ 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"
 
@@ -876,15 +876,15 @@ msgstr ""
 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 ""
 
@@ -908,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 "
@@ -944,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 "
@@ -972,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 ""
 
@@ -983,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\"."
@@ -999,13 +999,13 @@ msgstr ""
 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 ""
 
@@ -1030,24 +1030,24 @@ msgstr ""
 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 "
@@ -1072,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 ""
 
diff --git a/applications/luci-app-olsr/po/en/olsr.po b/applications/luci-app-olsr/po/en/olsr.po
index 5d4bde36be..ee68cdf692 100644
--- a/applications/luci-app-olsr/po/en/olsr.po
+++ b/applications/luci-app-olsr/po/en/olsr.po
@@ -25,23 +25,23 @@ msgstr "Active OLSR nodes"
 msgid "Active host net announcements"
 msgstr "Active host net announcements"
 
-#: 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 ""
 
@@ -68,8 +68,8 @@ msgstr ""
 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 ""
 
@@ -111,31 +111,31 @@ msgstr ""
 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 ""
 
@@ -143,13 +143,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 "
@@ -159,8 +159,8 @@ 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 ""
 
@@ -169,17 +169,17 @@ msgstr ""
 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 "General settings"
 
@@ -197,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 ""
@@ -207,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 "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 "HNA validity time"
 
@@ -226,22 +226,22 @@ msgstr "HNA validity time"
 msgid "HNA6 Announcements"
 msgstr "OLSR - HNA-Announcements"
 
-#: 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 "Hello interval"
 
+#: 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 validity time"
 
@@ -259,8 +259,8 @@ 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 ""
 
@@ -286,18 +286,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 ""
 
@@ -312,26 +312,26 @@ msgstr ""
 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."
@@ -342,52 +342,52 @@ msgstr ""
 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. "
@@ -396,14 +396,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -412,10 +412,10 @@ msgstr ""
 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 "
@@ -423,15 +423,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 ""
 
@@ -439,24 +439,24 @@ 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."
@@ -470,30 +470,30 @@ msgstr "Known OLSR routes"
 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."
@@ -507,28 +507,28 @@ msgstr "Last hop"
 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 "Library"
 
-#: 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 "
@@ -538,18 +538,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 ""
 
@@ -567,22 +567,22 @@ msgid "Local interface IP"
 msgstr "Local interface 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 "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 "MID validity time"
 
@@ -590,8 +590,8 @@ msgstr "MID validity time"
 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 ""
 
@@ -606,17 +606,17 @@ msgstr ""
 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 /"
@@ -633,8 +633,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 ""
 
@@ -660,22 +660,22 @@ msgstr ""
 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 ""
 
@@ -700,21 +700,21 @@ msgstr "OLSR - HNA-Announcements"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - HNA-Announcements"
 
-#: 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 ""
 
@@ -771,35 +771,35 @@ msgstr "Overview of known multiple interface announcements"
 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 "Plugin configuration"
 
 #: 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/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"
@@ -861,8 +861,8 @@ 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 ""
 
@@ -878,15 +878,15 @@ msgstr ""
 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 ""
 
@@ -910,34 +910,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 "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 "TC validity time"
 
-#: 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 "
@@ -946,27 +946,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 "
@@ -974,10 +974,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 ""
 
@@ -985,8 +985,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\"."
@@ -1001,13 +1001,13 @@ msgstr "Unable to connect to the OLSR daemon!"
 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 "Use hysteresis"
 
@@ -1032,24 +1032,24 @@ msgstr ""
 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 "
@@ -1074,8 +1074,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 "Willingness"
 
diff --git a/applications/luci-app-olsr/po/es/olsr.po b/applications/luci-app-olsr/po/es/olsr.po
index 5f7de169b1..15b335e732 100644
--- a/applications/luci-app-olsr/po/es/olsr.po
+++ b/applications/luci-app-olsr/po/es/olsr.po
@@ -25,23 +25,23 @@ msgstr "Nodos OLSR activos"
 msgid "Active host net announcements"
 msgstr "Declaraciones activas de dispositivos 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 puertas de enlace 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"
 
@@ -68,8 +68,8 @@ msgstr "Ambos valores en notación decimal con punto."
 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\""
 
@@ -113,19 +113,19 @@ msgstr "Configuración de descarga"
 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\"."
@@ -133,13 +133,13 @@ msgstr ""
 "Habilitar SmartGateway. Si se deshabilita 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 "Habilitar 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 "Habilitado"
 
@@ -147,13 +147,13 @@ msgstr "Habilitado"
 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 "
@@ -169,8 +169,8 @@ 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"
 
@@ -179,17 +179,17 @@ msgstr "Mecanismo Fisheye para TCs (marcado = activado). Activado por defecto"
 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"
 
@@ -207,8 +207,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"
@@ -217,17 +217,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"
 
@@ -235,22 +235,22 @@ msgstr "Tiempo de validez de HNA"
 msgid "HNA6 Announcements"
 msgstr "Anuncios 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 "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"
 
@@ -268,8 +268,8 @@ 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"
 
@@ -299,8 +299,8 @@ msgstr ""
 "Los hosts en una red enrutada OLSR pueden anunciar la conectividad a redes "
 "externas utilizando mensajes 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 "
@@ -310,10 +310,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"
 
@@ -330,13 +330,13 @@ msgstr ""
 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 "
@@ -346,13 +346,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."
@@ -365,17 +365,17 @@ msgstr ""
 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."
@@ -383,25 +383,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 "
@@ -411,13 +411,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. "
@@ -430,14 +430,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -446,10 +446,10 @@ msgstr "Este nodo usa NAT para conectar a internet. \"Sí\" por defecto."
 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 "
@@ -460,15 +460,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"
 
@@ -476,8 +476,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\"."
@@ -485,17 +485,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."
@@ -511,30 +511,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."
@@ -550,20 +550,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. "
@@ -574,8 +574,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 "
@@ -592,8 +592,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 "
@@ -604,10 +604,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"
 
@@ -625,22 +625,22 @@ 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"
 
@@ -648,8 +648,8 @@ msgstr "Tiempo de validez de MID"
 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"
 
@@ -667,17 +667,17 @@ msgstr ""
 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 /"
@@ -702,8 +702,8 @@ msgstr ""
 ">reduce LQ a fd91:662e:3c58::1 a la mitad: fd91:662e:3c58::1 0.5<br />reduce "
 "LQ a todos los nodos en esta interfaz en un 20%: por defecto 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"
 
@@ -729,22 +729,22 @@ msgstr "Vecinos"
 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"
 
@@ -768,21 +768,21 @@ msgstr "OLSR - Declaraciones HNA"
 msgid "OLSR - HNA6-Announcements"
 msgstr "OLSR - Anuncios 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"
 
@@ -839,35 +839,35 @@ msgstr "Declaraciones de múltiples interfaces conocidas"
 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/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"
@@ -938,8 +938,8 @@ 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"
 
@@ -955,8 +955,8 @@ msgstr "SmartGateway no está configurado."
 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\"."
@@ -964,8 +964,8 @@ 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"
 
@@ -989,34 +989,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 "
@@ -1030,8 +1030,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\"."
@@ -1039,13 +1039,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."
@@ -1053,8 +1053,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 "
@@ -1066,10 +1066,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"
 
@@ -1077,8 +1077,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\"."
@@ -1095,13 +1095,13 @@ msgstr "¡No puedo conectar con el demonio OLSR!"
 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"
 
@@ -1126,25 +1126,25 @@ msgstr "Muy bien (SNR > 30)"
 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 "
@@ -1181,8 +1181,8 @@ msgstr ""
 "enlace ascendente buscando un HNA6 ::ffff:0:0/96 o 2000::/3 local. La "
 "configuración predeterminada es \"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 "Willingness"
 
diff --git a/applications/luci-app-olsr/po/fr/olsr.po b/applications/luci-app-olsr/po/fr/olsr.po
index 54b2c1023e..a906f451f5 100644
--- a/applications/luci-app-olsr/po/fr/olsr.po
+++ b/applications/luci-app-olsr/po/fr/olsr.po
@@ -25,23 +25,23 @@ msgstr ""
 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 ""
 
@@ -68,8 +68,8 @@ msgstr ""
 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 ""
 
@@ -111,31 +111,31 @@ msgstr ""
 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 ""
 
@@ -143,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 "
@@ -159,8 +159,8 @@ 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 ""
 
@@ -169,17 +169,17 @@ msgstr ""
 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 ""
 
@@ -197,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 ""
@@ -207,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 ""
 
@@ -225,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 ""
 
@@ -258,8 +258,8 @@ 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 ""
 
@@ -285,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 ""
 
@@ -311,26 +311,26 @@ msgstr ""
 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."
@@ -341,52 +341,52 @@ msgstr ""
 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. "
@@ -395,14 +395,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -411,10 +411,10 @@ msgstr ""
 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 "
@@ -422,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 ""
 
@@ -438,24 +438,24 @@ 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."
@@ -469,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."
@@ -506,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 "
@@ -537,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 ""
 
@@ -566,22 +566,22 @@ 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 ""
 
@@ -589,8 +589,8 @@ msgstr ""
 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 ""
 
@@ -605,17 +605,17 @@ msgstr ""
 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 /"
@@ -632,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 ""
 
@@ -659,22 +659,22 @@ msgstr ""
 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 ""
 
@@ -698,21 +698,21 @@ 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 ""
 
@@ -769,35 +769,35 @@ msgstr ""
 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/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"
@@ -859,8 +859,8 @@ 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 ""
 
@@ -876,15 +876,15 @@ msgstr ""
 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 ""
 
@@ -908,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 "
@@ -944,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 "
@@ -972,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 ""
 
@@ -983,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\"."
@@ -999,13 +999,13 @@ msgstr ""
 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 ""
 
@@ -1030,24 +1030,24 @@ msgstr ""
 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 "
@@ -1072,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 ""
 
diff --git a/applications/luci-app-olsr/po/he/olsr.po b/applications/luci-app-olsr/po/he/olsr.po
index bdc15444f0..5d34821121 100644
--- a/applications/luci-app-olsr/po/he/olsr.po
+++ b/applications/luci-app-olsr/po/he/olsr.po
@@ -20,23 +20,23 @@ msgstr ""
 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 ""
 
@@ -63,8 +63,8 @@ msgstr ""
 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 ""
 
@@ -106,31 +106,31 @@ msgstr ""
 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 ""
 
@@ -138,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 "
@@ -154,8 +154,8 @@ 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 ""
 
@@ -164,17 +164,17 @@ msgstr ""
 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 ""
 
@@ -192,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 ""
@@ -202,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 ""
 
@@ -220,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 ""
 
@@ -253,8 +253,8 @@ 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 ""
 
@@ -280,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 ""
 
@@ -306,26 +306,26 @@ msgstr ""
 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."
@@ -336,52 +336,52 @@ msgstr ""
 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. "
@@ -390,14 +390,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -406,10 +406,10 @@ msgstr ""
 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 "
@@ -417,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 ""
 
@@ -433,24 +433,24 @@ 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."
@@ -464,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."
@@ -501,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 "
@@ -532,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 ""
 
@@ -561,22 +561,22 @@ 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 ""
 
@@ -584,8 +584,8 @@ msgstr ""
 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 ""
 
@@ -600,17 +600,17 @@ msgstr ""
 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 /"
@@ -627,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 ""
 
@@ -654,22 +654,22 @@ msgstr ""
 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 ""
 
@@ -693,21 +693,21 @@ 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 ""
 
@@ -764,35 +764,35 @@ msgstr ""
 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/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"
@@ -854,8 +854,8 @@ 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 ""
 
@@ -871,15 +871,15 @@ msgstr ""
 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 ""
 
@@ -903,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 "
@@ -939,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 "
@@ -967,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 ""
 
@@ -978,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\"."
@@ -994,13 +994,13 @@ msgstr ""
 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 ""
 
@@ -1025,24 +1025,24 @@ msgstr ""
 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 "
@@ -1067,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 ""
 
diff --git a/applications/luci-app-olsr/po/hu/olsr.po b/applications/luci-app-olsr/po/hu/olsr.po
index bdc15444f0..5d34821121 100644
--- a/applications/luci-app-olsr/po/hu/olsr.po
+++ b/applications/luci-app-olsr/po/hu/olsr.po
@@ -20,23 +20,23 @@ msgstr ""
 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 ""
 
@@ -63,8 +63,8 @@ msgstr ""
 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 ""
 
@@ -106,31 +106,31 @@ msgstr ""
 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 ""
 
@@ -138,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 "
@@ -154,8 +154,8 @@ 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 ""
 
@@ -164,17 +164,17 @@ msgstr ""
 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 ""
 
@@ -192,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 ""
@@ -202,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 ""
 
@@ -220,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 ""
 
@@ -253,8 +253,8 @@ 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 ""
 
@@ -280,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 ""
 
@@ -306,26 +306,26 @@ msgstr ""
 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."
@@ -336,52 +336,52 @@ msgstr ""
 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. "
@@ -390,14 +390,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -406,10 +406,10 @@ msgstr ""
 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 "
@@ -417,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 ""
 
@@ -433,24 +433,24 @@ 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."
@@ -464,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."
@@ -501,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 "
@@ -532,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 ""
 
@@ -561,22 +561,22 @@ 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 ""
 
@@ -584,8 +584,8 @@ msgstr ""
 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 ""
 
@@ -600,17 +600,17 @@ msgstr ""
 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 /"
@@ -627,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 ""
 
@@ -654,22 +654,22 @@ msgstr ""
 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 ""
 
@@ -693,21 +693,21 @@ 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 ""
 
@@ -764,35 +764,35 @@ msgstr ""
 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/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"
@@ -854,8 +854,8 @@ 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 ""
 
@@ -871,15 +871,15 @@ msgstr ""
 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 ""
 
@@ -903,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 "
@@ -939,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 "
@@ -967,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 ""
 
@@ -978,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\"."
@@ -994,13 +994,13 @@ msgstr ""
 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 ""
 
@@ -1025,24 +1025,24 @@ msgstr ""
 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 "
@@ -1067,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 ""
 
diff --git a/applications/luci-app-olsr/po/it/olsr.po b/applications/luci-app-olsr/po/it/olsr.po
index 43aeb17c3c..da23849091 100644
--- a/applications/luci-app-olsr/po/it/olsr.po
+++ b/applications/luci-app-olsr/po/it/olsr.po
@@ -25,23 +25,23 @@ msgstr "Nodi OLSR attivi"
 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"
 
@@ -68,8 +68,8 @@ msgstr "Entrambi i valori devono essere nella notazione decimale puntata"
 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 ""
 
@@ -111,19 +111,19 @@ msgstr "Configurazione Download"
 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\"."
@@ -131,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"
 
@@ -145,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 "
@@ -161,8 +161,8 @@ 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 ""
 
@@ -171,17 +171,17 @@ msgstr ""
 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"
 
@@ -199,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"
@@ -209,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"
 
@@ -228,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"
 
@@ -261,8 +261,8 @@ 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"
 
@@ -288,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 "
@@ -299,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"
 
@@ -319,13 +319,13 @@ msgstr ""
 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 "
@@ -335,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."
@@ -354,41 +354,41 @@ msgstr ""
 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 "
@@ -398,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. "
@@ -418,15 +418,15 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -435,10 +435,10 @@ msgstr ""
 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 "
@@ -446,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 ""
 
@@ -462,24 +462,24 @@ 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."
@@ -493,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."
@@ -530,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 "
@@ -561,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 ""
 
@@ -590,22 +590,22 @@ 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 ""
 
@@ -613,8 +613,8 @@ msgstr ""
 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 ""
 
@@ -629,17 +629,17 @@ msgstr ""
 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 /"
@@ -656,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 ""
 
@@ -683,22 +683,22 @@ msgstr ""
 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 ""
 
@@ -723,21 +723,21 @@ 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 ""
 
@@ -794,35 +794,35 @@ msgstr ""
 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/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"
@@ -884,8 +884,8 @@ 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 ""
 
@@ -901,15 +901,15 @@ msgstr ""
 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 ""
 
@@ -933,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 "
@@ -969,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 "
@@ -997,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 ""
 
@@ -1008,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\"."
@@ -1024,13 +1024,13 @@ msgstr "Impossibile connetersi al demone OLSR!"
 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"
 
@@ -1055,24 +1055,24 @@ msgstr ""
 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 "
@@ -1110,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 ""
 
diff --git a/applications/luci-app-olsr/po/ja/olsr.po b/applications/luci-app-olsr/po/ja/olsr.po
index 4b8176d781..31de79d870 100644
--- a/applications/luci-app-olsr/po/ja/olsr.po
+++ b/applications/luci-app-olsr/po/ja/olsr.po
@@ -25,23 +25,23 @@ msgstr "アクティブなOLSRノード"
 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 "通知するアップリンク"
 
@@ -68,8 +68,8 @@ msgstr "どちらの値もドット付き十進数の形式で入力してくだ
 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 ""
 
@@ -111,19 +111,19 @@ msgstr "設定ダウンロード"
 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\"."
@@ -131,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 "有効"
 
@@ -145,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 "
@@ -167,8 +167,8 @@ 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メカニズムを使用します。標準設定は\"有効\"です。"
 
@@ -177,17 +177,17 @@ msgstr "TCsのfisheyeメカニズムを使用します。標準設定は\"有効
 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 "一般設定"
 
@@ -205,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"
@@ -215,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 有効時間"
 
@@ -234,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 有効時間"
 
@@ -267,8 +267,8 @@ 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"
 
@@ -294,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 "
@@ -305,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アドレス"
 
@@ -325,13 +325,13 @@ msgstr ""
 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 "
@@ -341,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."
@@ -360,17 +360,17 @@ msgstr ""
 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."
@@ -378,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 "
@@ -406,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. "
@@ -426,16 +426,16 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -444,10 +444,10 @@ msgstr ""
 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 "
@@ -458,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 "インターフェース デフォルト設定"
 
@@ -474,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\"."
@@ -483,17 +483,17 @@ 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."
@@ -507,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."
@@ -544,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. "
@@ -567,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 "
@@ -585,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 "
@@ -597,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) マルチプリケーター"
 
@@ -618,22 +618,22 @@ 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 有効時間"
 
@@ -641,8 +641,8 @@ msgstr "MID 有効時間"
 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"
 
@@ -657,17 +657,17 @@ msgstr ""
 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 /"
@@ -689,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 しきい値"
 
@@ -716,22 +716,22 @@ msgstr "隣接ノード"
 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変更ポーリング間隔"
 
@@ -756,21 +756,21 @@ 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 デーモン - インターフェース"
 
@@ -827,35 +827,35 @@ msgstr "通知されているマルチ・インターフェースの一覧"
 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/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"
@@ -928,8 +928,8 @@ 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"
 
@@ -945,8 +945,8 @@ msgstr "スマート・ゲートウェイ(SmartGW)は設定されていません
 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\"."
@@ -954,8 +954,8 @@ 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 "アップリンク速度"
 
@@ -979,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 "
@@ -1020,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\"."
@@ -1029,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."
@@ -1043,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 "
@@ -1052,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 "送信間隔及び有効時間"
 
@@ -1063,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\"."
@@ -1081,13 +1081,13 @@ msgstr "OLSRデーモンに接続できません！"
 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 "ヒステリシスを使用する"
 
@@ -1112,8 +1112,8 @@ msgstr ""
 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."
@@ -1121,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 "
@@ -1169,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"
 
diff --git a/applications/luci-app-olsr/po/ms/olsr.po b/applications/luci-app-olsr/po/ms/olsr.po
index 00a3e7af8d..f02ff69a90 100644
--- a/applications/luci-app-olsr/po/ms/olsr.po
+++ b/applications/luci-app-olsr/po/ms/olsr.po
@@ -19,23 +19,23 @@ msgstr ""
 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 ""
 
@@ -62,8 +62,8 @@ msgstr ""
 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 ""
 
@@ -105,31 +105,31 @@ msgstr ""
 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 ""
 
@@ -137,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 "
@@ -153,8 +153,8 @@ 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 ""
 
@@ -163,17 +163,17 @@ msgstr ""
 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 ""
 
@@ -191,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 ""
@@ -201,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 ""
 
@@ -219,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 ""
 
@@ -252,8 +252,8 @@ 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 ""
 
@@ -279,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 ""
 
@@ -305,26 +305,26 @@ msgstr ""
 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."
@@ -335,52 +335,52 @@ msgstr ""
 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. "
@@ -389,14 +389,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -405,10 +405,10 @@ msgstr ""
 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 "
@@ -416,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 ""
 
@@ -432,24 +432,24 @@ 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."
@@ -463,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."
@@ -500,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 "
@@ -531,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 ""
 
@@ -560,22 +560,22 @@ 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 ""
 
@@ -583,8 +583,8 @@ msgstr ""
 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 ""
 
@@ -599,17 +599,17 @@ msgstr ""
 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 /"
@@ -626,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 ""
 
@@ -653,22 +653,22 @@ msgstr ""
 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 ""
 
@@ -692,21 +692,21 @@ 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 ""
 
@@ -763,35 +763,35 @@ msgstr ""
 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/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"
@@ -853,8 +853,8 @@ 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 ""
 
@@ -870,15 +870,15 @@ msgstr ""
 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 ""
 
@@ -902,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 "
@@ -938,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 "
@@ -966,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 ""
 
@@ -977,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\"."
@@ -993,13 +993,13 @@ msgstr ""
 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 ""
 
@@ -1024,24 +1024,24 @@ msgstr ""
 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 "
@@ -1066,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 ""
 
diff --git a/applications/luci-app-olsr/po/no/olsr.po b/applications/luci-app-olsr/po/no/olsr.po
index bdc15444f0..5d34821121 100644
--- a/applications/luci-app-olsr/po/no/olsr.po
+++ b/applications/luci-app-olsr/po/no/olsr.po
@@ -20,23 +20,23 @@ msgstr ""
 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 ""
 
@@ -63,8 +63,8 @@ msgstr ""
 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 ""
 
@@ -106,31 +106,31 @@ msgstr ""
 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 ""
 
@@ -138,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 "
@@ -154,8 +154,8 @@ 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 ""
 
@@ -164,17 +164,17 @@ msgstr ""
 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 ""
 
@@ -192,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 ""
@@ -202,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 ""
 
@@ -220,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 ""
 
@@ -253,8 +253,8 @@ 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 ""
 
@@ -280,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 ""
 
@@ -306,26 +306,26 @@ msgstr ""
 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."
@@ -336,52 +336,52 @@ msgstr ""
 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. "
@@ -390,14 +390,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -406,10 +406,10 @@ msgstr ""
 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 "
@@ -417,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 ""
 
@@ -433,24 +433,24 @@ 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."
@@ -464,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."
@@ -501,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 "
@@ -532,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 ""
 
@@ -561,22 +561,22 @@ 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 ""
 
@@ -584,8 +584,8 @@ msgstr ""
 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 ""
 
@@ -600,17 +600,17 @@ msgstr ""
 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 /"
@@ -627,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 ""
 
@@ -654,22 +654,22 @@ msgstr ""
 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 ""
 
@@ -693,21 +693,21 @@ 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 ""
 
@@ -764,35 +764,35 @@ msgstr ""
 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/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"
@@ -854,8 +854,8 @@ 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 ""
 
@@ -871,15 +871,15 @@ msgstr ""
 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 ""
 
@@ -903,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 "
@@ -939,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 "
@@ -967,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 ""
 
@@ -978,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\"."
@@ -994,13 +994,13 @@ msgstr ""
 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 ""
 
@@ -1025,24 +1025,24 @@ msgstr ""
 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 "
@@ -1067,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 ""
 
diff --git a/applications/luci-app-olsr/po/pl/olsr.po b/applications/luci-app-olsr/po/pl/olsr.po
index fd1ebdf4da..e2790e44f5 100644
--- a/applications/luci-app-olsr/po/pl/olsr.po
+++ b/applications/luci-app-olsr/po/pl/olsr.po
@@ -24,23 +24,23 @@ msgstr "Aktywne węzły OLSR"
 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"
 
@@ -69,8 +69,8 @@ msgstr ""
 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 ""
 
@@ -112,19 +112,19 @@ msgstr "Ustawienia pobierania"
 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\"."
@@ -132,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"
 
@@ -146,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 "
@@ -163,8 +163,8 @@ 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 "
@@ -175,17 +175,17 @@ msgstr ""
 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"
 
@@ -203,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"
@@ -213,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"
 
@@ -232,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"
 
@@ -265,8 +265,8 @@ 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"
 
@@ -297,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"
 
@@ -325,13 +325,13 @@ msgstr ""
 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 "
@@ -341,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."
@@ -360,18 +360,18 @@ msgstr ""
 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."
@@ -379,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 "
@@ -406,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. "
@@ -421,14 +421,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -437,10 +437,10 @@ msgstr "Czy węzeł korzysta z NAT do połączenia z Internetem. Domyślnie \"Ta
 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 "
@@ -451,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"
 
@@ -468,24 +468,24 @@ 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."
@@ -499,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."
@@ -536,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 "
@@ -568,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"
 
@@ -597,22 +597,22 @@ 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"
 
@@ -620,8 +620,8 @@ msgstr "Czas poprawności MID"
 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"
 
@@ -637,17 +637,17 @@ msgstr ""
 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 /"
@@ -664,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"
 
@@ -691,22 +691,22 @@ msgstr "Sąsiedzi"
 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 ""
 
@@ -731,21 +731,21 @@ 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"
 
@@ -802,35 +802,35 @@ msgstr "Przegląd znanych wielointerfejsowych ogłoszeń"
 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/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"
@@ -892,8 +892,8 @@ 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"
 
@@ -909,15 +909,15 @@ msgstr "SmartGateway jest nieskonfigurowane."
 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 ""
 
@@ -943,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 "
@@ -979,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."
@@ -1000,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 "
@@ -1009,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 ""
 
@@ -1020,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\"."
@@ -1036,13 +1036,13 @@ msgstr "Połączenie z demonem OLSR nieudane!"
 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"
 
@@ -1067,8 +1067,8 @@ msgstr ""
 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."
@@ -1076,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 "
@@ -1118,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ść"
 
diff --git a/applications/luci-app-olsr/po/pt-br/olsr.po b/applications/luci-app-olsr/po/pt-br/olsr.po
index 8918bc0bde..c88fad453c 100644
--- a/applications/luci-app-olsr/po/pt-br/olsr.po
+++ b/applications/luci-app-olsr/po/pt-br/olsr.po
@@ -27,23 +27,23 @@ msgstr "Nós OLSR ativos"
 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)"
 
@@ -73,8 +73,8 @@ 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'"
@@ -124,19 +124,19 @@ msgstr "Configuração do Recebimento de Dados "
 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\"."
@@ -144,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"
 
@@ -158,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 "
@@ -181,8 +181,8 @@ 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"
@@ -193,17 +193,17 @@ msgstr ""
 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"
 
@@ -224,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 ""
@@ -238,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 "
@@ -262,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)"
 
@@ -297,8 +297,8 @@ 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"
 
@@ -329,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 "
@@ -340,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"
 
@@ -360,13 +360,13 @@ msgstr ""
 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 "
@@ -376,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."
@@ -396,17 +396,17 @@ msgstr ""
 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."
@@ -414,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 "
@@ -442,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. "
@@ -462,14 +462,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -478,10 +478,10 @@ msgstr "Se este Nó usa NAT para conexões com a internet. Padrão é \"sim\"."
 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 "
@@ -492,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"
 
@@ -508,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\"."
@@ -518,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."
@@ -545,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."
@@ -586,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. "
@@ -610,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 "
@@ -628,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 "
@@ -640,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"
 
@@ -661,26 +661,26 @@ 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 "
@@ -690,8 +690,8 @@ msgstr ""
 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"
 
@@ -710,18 +710,18 @@ msgstr ""
 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 /"
@@ -747,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"
 
@@ -776,22 +776,22 @@ msgstr "Vizinhos"
 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"
 
@@ -819,21 +819,21 @@ 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"
 
@@ -891,36 +891,36 @@ msgstr "Visão geral de anúncios de nós com múltiplas interfaces conhecidas"
 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/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"
@@ -996,8 +996,8 @@ 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"
 
@@ -1013,8 +1013,8 @@ msgstr "SmartGateway não está configurado no seu sistema."
 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\"."
@@ -1023,8 +1023,8 @@ 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"
 
@@ -1050,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 "
@@ -1094,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\"."
@@ -1104,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."
@@ -1118,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 "
@@ -1131,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"
 
@@ -1142,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\"."
@@ -1160,13 +1160,13 @@ msgstr "Não foi possível conectar ao servidor OLSR!"
 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"
 
@@ -1194,8 +1194,8 @@ msgstr "Muito bom (SNR > 30)"
 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."
@@ -1203,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 "
@@ -1254,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"
 
diff --git a/applications/luci-app-olsr/po/pt/olsr.po b/applications/luci-app-olsr/po/pt/olsr.po
index 52158475b7..4a6cf490fc 100644
--- a/applications/luci-app-olsr/po/pt/olsr.po
+++ b/applications/luci-app-olsr/po/pt/olsr.po
@@ -26,23 +26,23 @@ msgstr "Nós OLSR ativos"
 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"
 
@@ -69,8 +69,8 @@ msgstr "Os valores tem de usar a dotação decimal."
 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 ""
 
@@ -112,19 +112,19 @@ msgstr "Descarregar Configuração"
 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\"."
@@ -132,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"
 
@@ -146,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 "
@@ -162,8 +162,8 @@ 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 ""
 
@@ -172,17 +172,17 @@ msgstr ""
 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"
 
@@ -200,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 ""
@@ -210,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"
 
@@ -229,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"
 
@@ -262,8 +262,8 @@ 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 ""
 
@@ -289,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"
 
@@ -315,26 +315,26 @@ msgstr ""
 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."
@@ -345,54 +345,54 @@ msgstr ""
 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. "
@@ -401,14 +401,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -417,10 +417,10 @@ msgstr ""
 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 "
@@ -431,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"
 
@@ -447,24 +447,24 @@ 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."
@@ -478,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."
@@ -516,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 "
@@ -547,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 ""
 
@@ -576,22 +576,22 @@ 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"
 
@@ -599,8 +599,8 @@ msgstr "Validade de MID"
 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"
 
@@ -615,17 +615,17 @@ msgstr ""
 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 /"
@@ -642,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 ""
 
@@ -669,22 +669,22 @@ msgstr "Vizinhos"
 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 ""
 
@@ -709,21 +709,21 @@ 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 ""
 
@@ -781,35 +781,35 @@ msgstr "Resumo de anuncios de nós com multiplos interfaces activos"
 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/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"
@@ -871,8 +871,8 @@ 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 ""
 
@@ -888,15 +888,15 @@ msgstr ""
 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"
 
@@ -920,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 "
@@ -956,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 "
@@ -984,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 ""
 
@@ -995,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\"."
@@ -1011,13 +1011,13 @@ msgstr "Não foi possivel ligar ao servidor OLSR!"
 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"
 
@@ -1042,24 +1042,24 @@ msgstr ""
 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 "
@@ -1084,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"
 
diff --git a/applications/luci-app-olsr/po/ro/olsr.po b/applications/luci-app-olsr/po/ro/olsr.po
index 151fd39fed..8c28bb2615 100644
--- a/applications/luci-app-olsr/po/ro/olsr.po
+++ b/applications/luci-app-olsr/po/ro/olsr.po
@@ -24,23 +24,23 @@ msgstr ""
 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 ""
 
@@ -67,8 +67,8 @@ msgstr ""
 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 ""
 
@@ -110,31 +110,31 @@ msgstr ""
 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"
 
@@ -142,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 "
@@ -158,8 +158,8 @@ 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 ""
 
@@ -168,17 +168,17 @@ msgstr ""
 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"
 
@@ -196,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 ""
@@ -206,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 ""
 
@@ -224,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 ""
 
@@ -257,8 +257,8 @@ 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 ""
 
@@ -284,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"
 
@@ -310,26 +310,26 @@ msgstr ""
 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."
@@ -340,52 +340,52 @@ msgstr ""
 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. "
@@ -394,14 +394,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -410,10 +410,10 @@ msgstr ""
 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 "
@@ -421,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"
 
@@ -437,24 +437,24 @@ 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."
@@ -468,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."
@@ -505,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 "
@@ -536,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 ""
 
@@ -565,22 +565,22 @@ 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 ""
 
@@ -588,8 +588,8 @@ msgstr ""
 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 ""
 
@@ -604,17 +604,17 @@ msgstr ""
 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 /"
@@ -631,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 ""
 
@@ -658,22 +658,22 @@ msgstr "Vecini"
 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 ""
 
@@ -697,21 +697,21 @@ 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 ""
 
@@ -768,35 +768,35 @@ msgstr ""
 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/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"
@@ -858,8 +858,8 @@ 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 ""
 
@@ -875,15 +875,15 @@ msgstr ""
 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 ""
 
@@ -907,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 "
@@ -943,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 "
@@ -971,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 ""
 
@@ -982,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\"."
@@ -998,13 +998,13 @@ msgstr ""
 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 ""
 
@@ -1029,24 +1029,24 @@ msgstr ""
 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 "
@@ -1071,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 ""
 
diff --git a/applications/luci-app-olsr/po/ru/olsr.po b/applications/luci-app-olsr/po/ru/olsr.po
index b5a7d878b6..6c17998945 100644
--- a/applications/luci-app-olsr/po/ru/olsr.po
+++ b/applications/luci-app-olsr/po/ru/olsr.po
@@ -27,23 +27,23 @@ msgstr "Активные OLSR узлы"
 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 "Объявить внешнее соединение"
 
@@ -72,8 +72,8 @@ msgstr ""
 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 адрес или 'по умолчанию'"
 
@@ -117,19 +117,19 @@ msgstr "Загрузить config файл"
 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\"."
@@ -137,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 "Включено"
 
@@ -151,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 "
@@ -174,8 +174,8 @@ 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-ов (средство проверки). По умолчанию 'включено'."
@@ -185,17 +185,17 @@ msgstr ""
 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 "Основные настройки"
 
@@ -213,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"
@@ -223,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"
 
@@ -241,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 "Время действия приветствия"
 
@@ -274,8 +274,8 @@ 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"
 
@@ -305,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 "
@@ -316,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-Адреса"
 
@@ -336,13 +336,13 @@ msgstr ""
 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 "
@@ -352,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."
@@ -371,17 +371,17 @@ msgstr ""
 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."
@@ -389,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 "
@@ -418,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. "
@@ -438,15 +438,15 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -455,10 +455,10 @@ msgstr ""
 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 "
@@ -469,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 "Значения по умолчанию для интерфейсов"
 
@@ -485,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\"."
@@ -494,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."
@@ -521,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."
@@ -560,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. "
@@ -583,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 "
@@ -600,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 "
@@ -611,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)"
 
@@ -632,22 +632,22 @@ 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"
 
@@ -655,8 +655,8 @@ msgstr "Время действия MID"
 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-адрес"
 
@@ -673,17 +673,17 @@ msgstr ""
 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 /"
@@ -709,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"
 
@@ -736,22 +736,22 @@ msgstr "Соседние узлы"
 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 "Сетевой адаптер изменяет интервал опроса"
 
@@ -775,21 +775,21 @@ 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 демон - Интерфейс"
 
@@ -846,35 +846,35 @@ msgstr "Обзор известных объявлений с нескольки
 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/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"
@@ -947,8 +947,8 @@ 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"
 
@@ -964,8 +964,8 @@ msgstr "SmartGW (смарт-шлюз) не настроен на этой сис
 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\"."
@@ -974,8 +974,8 @@ 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 "Скорость внешнего соединения"
 
@@ -1000,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 "
@@ -1041,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\"."
@@ -1051,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."
@@ -1065,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 "
@@ -1078,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 "Время и срок действия"
 
@@ -1089,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\"."
@@ -1107,13 +1107,13 @@ msgstr "Не удалось подключиться к демону OLSR!"
 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 "Использовать гистерезис"
 
@@ -1138,8 +1138,8 @@ msgstr "Очень хорошо (SNR > 30)"
 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."
@@ -1147,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 "
@@ -1195,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 "Готовность"
 
diff --git a/applications/luci-app-olsr/po/sk/olsr.po b/applications/luci-app-olsr/po/sk/olsr.po
index 0a2d4f7a55..74df7ec6df 100644
--- a/applications/luci-app-olsr/po/sk/olsr.po
+++ b/applications/luci-app-olsr/po/sk/olsr.po
@@ -20,23 +20,23 @@ msgstr ""
 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 ""
 
@@ -63,8 +63,8 @@ msgstr ""
 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 ""
 
@@ -106,31 +106,31 @@ msgstr ""
 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 ""
 
@@ -138,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 "
@@ -154,8 +154,8 @@ 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 ""
 
@@ -164,17 +164,17 @@ msgstr ""
 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 ""
 
@@ -192,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 ""
@@ -202,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 ""
 
@@ -220,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 ""
 
@@ -253,8 +253,8 @@ 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 ""
 
@@ -280,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 ""
 
@@ -306,26 +306,26 @@ msgstr ""
 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."
@@ -336,52 +336,52 @@ msgstr ""
 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. "
@@ -390,14 +390,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -406,10 +406,10 @@ msgstr ""
 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 "
@@ -417,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 ""
 
@@ -433,24 +433,24 @@ 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."
@@ -464,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."
@@ -501,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 "
@@ -532,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 ""
 
@@ -561,22 +561,22 @@ 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 ""
 
@@ -584,8 +584,8 @@ msgstr ""
 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 ""
 
@@ -600,17 +600,17 @@ msgstr ""
 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 /"
@@ -627,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 ""
 
@@ -654,22 +654,22 @@ msgstr ""
 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 ""
 
@@ -693,21 +693,21 @@ 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 ""
 
@@ -764,35 +764,35 @@ msgstr ""
 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/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"
@@ -854,8 +854,8 @@ 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 ""
 
@@ -871,15 +871,15 @@ msgstr ""
 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 ""
 
@@ -903,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 "
@@ -939,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 "
@@ -967,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 ""
 
@@ -978,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\"."
@@ -994,13 +994,13 @@ msgstr ""
 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 ""
 
@@ -1025,24 +1025,24 @@ msgstr ""
 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 "
@@ -1067,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 ""
 
diff --git a/applications/luci-app-olsr/po/sv/olsr.po b/applications/luci-app-olsr/po/sv/olsr.po
index 4d35fc4684..1ee56ec34f 100644
--- a/applications/luci-app-olsr/po/sv/olsr.po
+++ b/applications/luci-app-olsr/po/sv/olsr.po
@@ -21,23 +21,23 @@ msgstr "Aktiva OLSR-noder"
 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"
 
@@ -64,8 +64,8 @@ msgstr ""
 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'"
 
@@ -109,31 +109,31 @@ msgstr ""
 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"
 
@@ -141,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 "
@@ -157,8 +157,8 @@ 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 ""
 
@@ -167,17 +167,17 @@ msgstr ""
 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"
 
@@ -195,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"
@@ -205,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"
 
@@ -223,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å"
 
@@ -256,8 +256,8 @@ 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 ""
 
@@ -283,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"
 
@@ -309,26 +309,26 @@ msgstr ""
 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."
@@ -339,52 +339,52 @@ msgstr ""
 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. "
@@ -393,14 +393,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -409,10 +409,10 @@ msgstr ""
 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 "
@@ -420,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"
 
@@ -436,24 +436,24 @@ 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."
@@ -467,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."
@@ -504,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 "
@@ -535,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 ""
 
@@ -564,22 +564,22 @@ 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 ""
 
@@ -587,8 +587,8 @@ msgstr ""
 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"
 
@@ -603,17 +603,17 @@ msgstr ""
 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 /"
@@ -630,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 ""
 
@@ -657,22 +657,22 @@ msgstr "Grannar"
 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 ""
 
@@ -696,21 +696,21 @@ 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"
 
@@ -767,35 +767,35 @@ msgstr ""
 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/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"
@@ -857,8 +857,8 @@ 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 ""
 
@@ -874,15 +874,15 @@ msgstr ""
 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 ""
 
@@ -906,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 "
@@ -942,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 "
@@ -970,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 ""
 
@@ -981,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\"."
@@ -997,13 +997,13 @@ msgstr "Kunde inte ansluta till OLSR-demonen!"
 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 ""
 
@@ -1028,8 +1028,8 @@ msgstr "Jättebra (SNR > 30)"
 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."
@@ -1037,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 "
@@ -1072,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"
 
diff --git a/applications/luci-app-olsr/po/templates/olsr.pot b/applications/luci-app-olsr/po/templates/olsr.pot
index 3cdba5afa1..91b5830657 100644
--- a/applications/luci-app-olsr/po/templates/olsr.pot
+++ b/applications/luci-app-olsr/po/templates/olsr.pot
@@ -13,23 +13,23 @@ msgstr ""
 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 ""
 
@@ -56,8 +56,8 @@ msgstr ""
 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 ""
 
@@ -99,31 +99,31 @@ msgstr ""
 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 +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 "
@@ -147,8 +147,8 @@ 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 ""
 
@@ -157,17 +157,17 @@ msgstr ""
 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 ""
 
@@ -185,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 ""
@@ -195,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 ""
 
@@ -213,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 ""
 
@@ -246,8 +246,8 @@ 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 ""
 
@@ -273,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 ""
 
@@ -299,26 +299,26 @@ msgstr ""
 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."
@@ -329,52 +329,52 @@ msgstr ""
 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. "
@@ -383,14 +383,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -399,10 +399,10 @@ msgstr ""
 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 "
@@ -410,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 ""
 
@@ -426,24 +426,24 @@ 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."
@@ -457,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."
@@ -494,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 "
@@ -525,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 ""
 
@@ -554,22 +554,22 @@ 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 ""
 
@@ -577,8 +577,8 @@ msgstr ""
 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 ""
 
@@ -593,17 +593,17 @@ msgstr ""
 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 /"
@@ -620,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 ""
 
@@ -647,22 +647,22 @@ msgstr ""
 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 ""
 
@@ -686,21 +686,21 @@ 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 ""
 
@@ -757,35 +757,35 @@ msgstr ""
 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/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"
@@ -847,8 +847,8 @@ 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 ""
 
@@ -864,15 +864,15 @@ msgstr ""
 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 ""
 
@@ -896,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 "
@@ -932,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 "
@@ -960,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 ""
 
@@ -971,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\"."
@@ -987,13 +987,13 @@ msgstr ""
 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 ""
 
@@ -1018,24 +1018,24 @@ msgstr ""
 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 "
@@ -1060,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 ""
 
diff --git a/applications/luci-app-olsr/po/tr/olsr.po b/applications/luci-app-olsr/po/tr/olsr.po
index 0b875f4549..3385fa6541 100644
--- a/applications/luci-app-olsr/po/tr/olsr.po
+++ b/applications/luci-app-olsr/po/tr/olsr.po
@@ -20,23 +20,23 @@ msgstr ""
 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 ""
 
@@ -63,8 +63,8 @@ msgstr ""
 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 ""
 
@@ -106,31 +106,31 @@ msgstr ""
 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 ""
 
@@ -138,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 "
@@ -154,8 +154,8 @@ 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 ""
 
@@ -164,17 +164,17 @@ msgstr ""
 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 ""
 
@@ -192,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 ""
@@ -202,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 ""
 
@@ -220,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 ""
 
@@ -253,8 +253,8 @@ 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 ""
 
@@ -280,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 ""
 
@@ -306,26 +306,26 @@ msgstr ""
 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."
@@ -336,52 +336,52 @@ msgstr ""
 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. "
@@ -390,14 +390,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -406,10 +406,10 @@ msgstr ""
 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 "
@@ -417,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 ""
 
@@ -433,24 +433,24 @@ 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."
@@ -464,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."
@@ -501,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 "
@@ -532,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 ""
 
@@ -561,22 +561,22 @@ 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 ""
 
@@ -584,8 +584,8 @@ msgstr ""
 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 ""
 
@@ -600,17 +600,17 @@ msgstr ""
 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 /"
@@ -627,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 ""
 
@@ -654,22 +654,22 @@ msgstr ""
 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 ""
 
@@ -693,21 +693,21 @@ 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 ""
 
@@ -764,35 +764,35 @@ msgstr ""
 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/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"
@@ -854,8 +854,8 @@ 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 ""
 
@@ -871,15 +871,15 @@ msgstr ""
 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 ""
 
@@ -903,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 "
@@ -939,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 "
@@ -967,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 ""
 
@@ -978,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\"."
@@ -994,13 +994,13 @@ msgstr ""
 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 ""
 
@@ -1025,24 +1025,24 @@ msgstr ""
 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 "
@@ -1067,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 ""
 
diff --git a/applications/luci-app-olsr/po/uk/olsr.po b/applications/luci-app-olsr/po/uk/olsr.po
index 850d3bdaa7..9d6e8b1db5 100644
--- a/applications/luci-app-olsr/po/uk/olsr.po
+++ b/applications/luci-app-olsr/po/uk/olsr.po
@@ -21,23 +21,23 @@ msgstr ""
 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 ""
 
@@ -64,8 +64,8 @@ msgstr ""
 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 ""
 
@@ -107,31 +107,31 @@ msgstr ""
 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 ""
 
@@ -139,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 "
@@ -155,8 +155,8 @@ 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 ""
 
@@ -165,17 +165,17 @@ msgstr ""
 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 ""
 
@@ -193,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 ""
@@ -203,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 ""
 
@@ -221,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 ""
 
@@ -254,8 +254,8 @@ 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 ""
 
@@ -281,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 ""
 
@@ -307,26 +307,26 @@ msgstr ""
 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."
@@ -337,52 +337,52 @@ msgstr ""
 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. "
@@ -391,14 +391,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -407,10 +407,10 @@ msgstr ""
 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 "
@@ -418,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 ""
 
@@ -434,24 +434,24 @@ 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."
@@ -465,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."
@@ -502,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 "
@@ -533,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 ""
 
@@ -562,22 +562,22 @@ 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 ""
 
@@ -585,8 +585,8 @@ msgstr ""
 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 ""
 
@@ -601,17 +601,17 @@ msgstr ""
 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 /"
@@ -628,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 ""
 
@@ -655,22 +655,22 @@ msgstr ""
 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 ""
 
@@ -694,21 +694,21 @@ 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 ""
 
@@ -765,35 +765,35 @@ msgstr ""
 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/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"
@@ -855,8 +855,8 @@ 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 ""
 
@@ -872,15 +872,15 @@ msgstr ""
 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 ""
 
@@ -904,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 "
@@ -940,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 "
@@ -968,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 ""
 
@@ -979,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\"."
@@ -995,13 +995,13 @@ msgstr ""
 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 ""
 
@@ -1026,24 +1026,24 @@ msgstr ""
 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 "
@@ -1068,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 ""
 
diff --git a/applications/luci-app-olsr/po/vi/olsr.po b/applications/luci-app-olsr/po/vi/olsr.po
index 887d56ec7d..ae73fafc66 100644
--- a/applications/luci-app-olsr/po/vi/olsr.po
+++ b/applications/luci-app-olsr/po/vi/olsr.po
@@ -26,23 +26,23 @@ msgstr "Những OLSR nodes đang hoạt động"
 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 ""
 
@@ -69,8 +69,8 @@ msgstr ""
 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 ""
 
@@ -112,31 +112,31 @@ msgstr ""
 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 ""
 
@@ -144,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 "
@@ -160,8 +160,8 @@ 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 ""
 
@@ -170,17 +170,17 @@ msgstr ""
 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"
 
@@ -198,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 ""
@@ -208,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 "
 
@@ -227,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"
 
@@ -260,8 +260,8 @@ 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 ""
 
@@ -287,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 ""
 
@@ -313,26 +313,26 @@ msgstr ""
 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."
@@ -343,52 +343,52 @@ msgstr ""
 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. "
@@ -397,14 +397,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -413,10 +413,10 @@ msgstr ""
 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 "
@@ -424,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 ""
 
@@ -440,24 +440,24 @@ 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."
@@ -471,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."
@@ -508,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 "
@@ -539,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 ""
 
@@ -568,22 +568,22 @@ 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"
 
@@ -591,8 +591,8 @@ msgstr "Thời gian hợp lệ hóa MID"
 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 ""
 
@@ -607,17 +607,17 @@ msgstr ""
 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 /"
@@ -634,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 ""
 
@@ -661,22 +661,22 @@ msgstr ""
 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 ""
 
@@ -701,21 +701,21 @@ 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 ""
 
@@ -772,35 +772,35 @@ msgstr "Tổng quát về thông báo của nhiều giao diện đã biết"
 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/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"
@@ -862,8 +862,8 @@ 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 ""
 
@@ -879,15 +879,15 @@ msgstr ""
 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 ""
 
@@ -911,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 "
@@ -947,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 "
@@ -975,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 ""
 
@@ -986,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\"."
@@ -1002,13 +1002,13 @@ msgstr "Không thể kết nối với OLSR daemon!"
 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"
 
@@ -1033,24 +1033,24 @@ msgstr ""
 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 "
@@ -1075,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"
 
diff --git a/applications/luci-app-olsr/po/zh-cn/olsr.po b/applications/luci-app-olsr/po/zh-cn/olsr.po
index 4d6d3561c4..47b87f9976 100644
--- a/applications/luci-app-olsr/po/zh-cn/olsr.po
+++ b/applications/luci-app-olsr/po/zh-cn/olsr.po
@@ -26,23 +26,23 @@ msgstr "活动的 OLSR 节点"
 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 "通告上行链接"
 
@@ -69,8 +69,8 @@ msgstr "两个值必须使用点分十进制表示法。"
 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 地址，或“默认”"
 
@@ -113,19 +113,19 @@ msgstr "下载配置"
 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\"."
@@ -133,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 "已启用"
 
@@ -147,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 "
@@ -167,8 +167,8 @@ 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 的鱼眼机制（校验和开启）。默认为“开启”"
 
@@ -177,17 +177,17 @@ msgstr "TC 的鱼眼机制（校验和开启）。默认为“开启”"
 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 "一般设置"
 
@@ -205,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"
@@ -215,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 有效时长"
 
@@ -233,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 有效时长"
 
@@ -266,8 +266,8 @@ 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"
 
@@ -293,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 "
@@ -303,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 地址"
 
@@ -321,13 +321,13 @@ msgstr "要使用的 IP 版本。如果选择 6and4，则为每个协议启动�
 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 "
@@ -336,13 +336,13 @@ 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."
@@ -353,39 +353,39 @@ msgstr "传出 OLSR 包的 IPv4 源地址。默认为“0.0.0.0”，将触发�
 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 "
@@ -394,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. "
@@ -412,14 +412,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -428,10 +428,10 @@ msgstr "如果此节点使用 NAT 连接到互联网。默认为“是”。"
 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 "
@@ -441,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 "接口默认值"
 
@@ -457,24 +457,24 @@ 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."
@@ -489,30 +489,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."
@@ -526,20 +526,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. "
@@ -548,8 +548,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 "
@@ -564,8 +564,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 "
@@ -575,10 +575,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 乘数"
 
@@ -596,22 +596,22 @@ 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 有效期"
 
@@ -619,8 +619,8 @@ msgstr "MID 有效期"
 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"
 
@@ -637,17 +637,17 @@ msgstr ""
 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 /"
@@ -670,8 +670,8 @@ msgstr ""
 "大于 0 时使用。示例：<br />将到 fd91:662e:3c58::1 的 LQ 减半："
 "fd91:662e:3c58::1 0.5<br />将此接口到所有节点的 LQ 减少 20%：默认 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 阈值"
 
@@ -697,22 +697,22 @@ msgstr "邻居"
 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 更改轮询间隔"
 
@@ -736,21 +736,21 @@ 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 守护进程 - 接口"
 
@@ -807,35 +807,35 @@ msgstr "已知的多接口通告概览"
 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/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"
@@ -903,8 +903,8 @@ 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"
 
@@ -920,8 +920,8 @@ msgstr "此系统上未配置 SmartGateway。"
 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\"."
@@ -929,8 +929,8 @@ 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 "上行链路的速度"
 
@@ -954,34 +954,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 "
@@ -994,8 +994,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\"."
@@ -1003,13 +1003,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."
@@ -1017,8 +1017,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 "
@@ -1029,10 +1029,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 "时间和有效性"
 
@@ -1040,8 +1040,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\"."
@@ -1056,13 +1056,13 @@ msgstr "无法连接到 OLSR 守护程序！"
 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 "使用滞后"
 
@@ -1087,8 +1087,8 @@ msgstr "非常好（SNR > 30）"
 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."
@@ -1096,17 +1096,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 "
@@ -1139,8 +1139,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 "意愿值"
 
diff --git a/applications/luci-app-olsr/po/zh-tw/olsr.po b/applications/luci-app-olsr/po/zh-tw/olsr.po
index da4972078c..007612a62b 100644
--- a/applications/luci-app-olsr/po/zh-tw/olsr.po
+++ b/applications/luci-app-olsr/po/zh-tw/olsr.po
@@ -26,23 +26,23 @@ msgstr "活動的 OLSR 節點"
 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 "通告上行連結"
 
@@ -69,8 +69,8 @@ msgstr "兩個值必須使用點分十進位制表示法。"
 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 位址，或“預設”"
 
@@ -113,19 +113,19 @@ msgstr "下載配置"
 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\"."
@@ -133,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 "已啟用"
 
@@ -147,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 "
@@ -167,8 +167,8 @@ 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 的魚眼機制（校驗和開啟）。預設為“開啟”"
 
@@ -177,17 +177,17 @@ msgstr "TC 的魚眼機制（校驗和開啟）。預設為“開啟”"
 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 "一般設定"
 
@@ -205,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"
@@ -215,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 有效時長"
 
@@ -233,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 有效時長"
 
@@ -266,8 +266,8 @@ 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"
 
@@ -293,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 "
@@ -303,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 位址"
 
@@ -321,13 +321,13 @@ msgstr "要使用的 IP 版本。如果選擇 6and4，則為每個協議啟動�
 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 "
@@ -336,13 +336,13 @@ 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."
@@ -353,39 +353,39 @@ msgstr "傳出 OLSR 包的 IPv4 源位址。預設為“0.0.0.0”，將觸發�
 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 "
@@ -394,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. "
@@ -412,14 +412,14 @@ 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:62
 #: applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm:128
@@ -428,10 +428,10 @@ msgstr "如果此節點使用 NAT 連線到網際網路。預設為“是”。"
 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 "
@@ -441,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 "介面預設值"
 
@@ -457,24 +457,24 @@ 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."
@@ -488,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."
@@ -525,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. "
@@ -547,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 "
@@ -563,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 "
@@ -574,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 乘數"
 
@@ -595,22 +595,22 @@ 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 有效期"
 
@@ -618,8 +618,8 @@ msgstr "MID 有效期"
 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,17 +636,17 @@ msgstr ""
 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 /"
@@ -669,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 閾值"
 
@@ -696,22 +696,22 @@ msgstr "鄰居"
 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 更改輪詢間隔"
 
@@ -735,21 +735,21 @@ 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 守護程序 - 介面"
 
@@ -806,35 +806,35 @@ msgstr "已知的多介面通告概覽"
 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/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"
@@ -902,8 +902,8 @@ 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"
 
@@ -919,8 +919,8 @@ msgstr "此係統上未配置 SmartGateway。"
 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\"."
@@ -928,8 +928,8 @@ 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 "上行鏈路的速度"
 
@@ -953,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 "
@@ -993,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\"."
@@ -1002,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 "
@@ -1027,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 "時間和有效性"
 
@@ -1038,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\"."
@@ -1054,13 +1054,13 @@ msgstr "無法連線到 OLSR 守護程式！"
 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 "使用滯後"
 
@@ -1085,8 +1085,8 @@ msgstr "非常好（SNR > 30）"
 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."
@@ -1094,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 "
@@ -1137,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 "意願值"
author	INAGAKI Hiroshi <musashino.open@gmail.com>	2019-07-13 15:50:53 +0900
committer	Yousong Zhou <yszhou4tech@gmail.com>	2019-07-13 19:23:18 +0800
commit	19c4b71af42783bdd909bfb57b259437ea5b129d (patch)
tree	86732e2591ac5112e6dee84ba4e27d28123da3be /applications/luci-app-olsr
parent	48b61ca2c4f032f0629cb8b8c7248353643a6ae8 (diff)