Merge pull request #3457 from musashino205/i18n/sync

i18n: fix and sync translations

1 files changed, 124 insertions, 124 deletions

diff --git a/applications/luci-app-olsr/po/ru/olsr.po b/applications/luci-app-olsr/po/ru/olsr.po
index cb5e112bf5..aa868efa3a 100644
--- a/applications/luci-app-olsr/po/ru/olsr.po
+++ b/applications/luci-app-olsr/po/ru/olsr.po
@@ -28,23 +28,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 "Объявить внешнее соединение"
 
@@ -73,8 +73,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 адрес или 'по умолчанию'"
 
@@ -118,19 +118,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\"."
@@ -138,13 +138,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 "Включено"
 
@@ -152,13 +152,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 "
@@ -175,8 +175,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-ов (средство проверки). По умолчанию 'включено'."
@@ -186,17 +186,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 "Основные настройки"
 
@@ -214,8 +214,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"
@@ -224,17 +224,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"
 
@@ -242,22 +242,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 "Время действия приветствия"
 
@@ -275,8 +275,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"
 
@@ -306,8 +306,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 "
@@ -317,10 +317,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-Адреса"
 
@@ -337,13 +337,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 "
@@ -353,13 +353,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."
@@ -372,17 +372,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."
@@ -390,25 +390,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 "
@@ -419,13 +419,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. "
@@ -439,15 +439,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
@@ -456,10 +456,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 "
@@ -470,15 +470,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 "Значения по умолчанию для интерфейсов"
 
@@ -486,8 +486,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\"."
@@ -495,18 +495,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."
@@ -522,30 +522,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."
@@ -561,20 +561,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. "
@@ -584,8 +584,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 "
@@ -601,8 +601,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 "
@@ -612,10 +612,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)"
 
@@ -633,22 +633,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"
 
@@ -656,8 +656,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-адрес"
 
@@ -674,17 +674,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 /"
@@ -710,8 +710,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"
 
@@ -737,22 +737,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 "Сетевой адаптер изменяет интервал опроса"
 
@@ -776,21 +776,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 демон - Интерфейс"
 
@@ -847,35 +847,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"
@@ -948,8 +948,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"
 
@@ -965,8 +965,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\"."
@@ -975,8 +975,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 "Скорость внешнего соединения"
 
@@ -1001,34 +1001,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 "
@@ -1042,8 +1042,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\"."
@@ -1052,13 +1052,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."
@@ -1066,8 +1066,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 "
@@ -1079,10 +1079,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 "Время и срок действия"
 
@@ -1090,8 +1090,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\"."
@@ -1108,13 +1108,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 "Использовать гистерезис"
 
@@ -1139,8 +1139,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."
@@ -1148,17 +1148,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 "
@@ -1196,8 +1196,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 "Готовность"