1 files changed, 144 insertions, 97 deletions

diff --git a/applications/luci-app-upnp/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po
index 909b24255e..e1411e32b7 100644
--- a/applications/luci-app-upnp/po/ru/upnp.po
+++ b/applications/luci-app-upnp/po/ru/upnp.po
@@ -16,68 +16,75 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:182
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
+msgctxt ""
+"A 900s interval will result in %s (%s = SSDP) notifications with the minimum "
+"max-age of 1800s"
+msgid ""
+"A 900s interval will result in %s notifications with the minimum max-age of "
+"1800s"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:196
 msgid ""
-"ACLs specify which external ports can be forwarded to which client addresses "
-"and ports, IPv6 always allowed."
+"ACL specify which client addresses and ports can be mapped, IPv6 always "
+"allowed."
 msgstr ""
-"ACL определяет, какие внешние порты могут быть перенаправлены на те или иные "
-"клиентские адреса и порты, IPv6 всегда разрешен."
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:202
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:215
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:31
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
-msgid "Active Port Forwards"
-msgstr "Активные UPnP-переадресации"
+msgid "Active Service Port Maps"
+msgstr "Активные переадресации"
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:31
+msgid "Active UPnP IGD & PCP/NAT-PMP Port Maps"
+msgstr ""
 
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:119
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
-msgid "Advertise as UPnP IGDv1 device (no IPv6) instead of IGDv2"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
+msgid "Advertise as IGDv1 (IPv4 only) device instead of IGDv2"
 msgstr "Объявить как IGDv1 устройство вместо IGDv2"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:203
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:216
 msgid "Allow"
 msgstr "Разрешить"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
-msgid "Allow adding port forwards only to requesting IP addresses"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:156
+msgid "Allow adding port maps for requesting IP addresses only"
 msgstr "Разрешить перенаправление только для запрашивающих IP-адресов"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:150
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:179
 msgid "Announced model number"
 msgstr "Объявить номер модели"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:182
 msgid "Announced serial number"
 msgstr "Объявить серийный номер"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:160
-msgid "Clean rules interval"
-msgstr "Интервал очистки правил"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:203
+msgid "Client Address"
+msgstr "Адрес клиента"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:156
-msgid "Clean rules threshold"
-msgstr "Порог очистки правил"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
+msgid "Client Name"
+msgstr ""
 
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:45
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:85
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:194
-msgid "Client Address"
-msgstr "Адрес клиента"
-
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:47
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:87
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:198
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:207
 msgid "Client Port"
 msgstr "Порт клиента"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:201
 msgid "Comment"
 msgstr "Комментарий"
 
@@ -87,7 +94,7 @@ msgstr "Комментарий"
 msgid "Delete"
 msgstr "Удалить"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:204
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:217
 msgid "Deny"
 msgstr "Отказать"
 
@@ -96,127 +103,144 @@ msgstr "Отказать"
 msgid "Description"
 msgstr "Описание"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:148
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "Device UUID"
 msgstr "UUID устройства"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:135
 msgid "Download speed"
 msgstr "Внутреннее соединение"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
-msgid "Enable PCP/NAT-PMP protocol"
-msgstr "Включить NAT-PMP"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
+msgid "Enable PCP/NAT-PMP protocols"
+msgstr ""
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Enable UPnP IGD protocol"
-msgstr "Включить UPnP"
-
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
-msgid "Enable UPnP IGDv1 mode"
-msgstr "IGDv1 режим"
+msgstr "Включить UPnP IGD"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:189
 msgid "Enable additional logging"
 msgstr "Дополнительное журналирование"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:155
 msgid "Enable secure mode"
 msgstr "Защищённый режим"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:44
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:84
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:190
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:86
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:211
 msgid "External Port"
 msgstr "Внешний порт"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
-msgid "General Settings"
-msgstr "Основные Настройки"
-
 #: applications/luci-app-upnp/root/usr/share/rpcd/acl.d/luci-app-upnp.json:3
 msgid "Grant access to UPnP IGD & PCP/NAT-PMP"
-msgstr "Предоставить доступ к процедурам UPnP"
-
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:46
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:86
-msgid "Host"
-msgstr "Устройство"
+msgstr ""
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:152
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:160
 msgid "Notify interval"
 msgstr "Интервал уведомления"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:142
-msgid "Port"
-msgstr "Порт"
-
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:171
 msgid "Presentation URL"
 msgstr "Задать URL-адрес"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:43
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:83
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:87
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:134
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:190
 msgid "Puts extra debugging information into the system log"
 msgstr "Добавлять дополнительную отладочную информацию в системный журнал"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:172
+msgid "Report custom router web interface (presentation) URL"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
+msgid "Report maximum download speed in kByte/s"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:140
+msgid "Report maximum upload speed in kByte/s"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:185
 msgid "Report system instead of service uptime"
 msgstr "Сообщать время работы системы вместо службы"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:172
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:166
+msgid "SOAP/HTTP port"
+msgstr "Порт"
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "STUN Host"
 msgstr "Хост STUN"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:150
 msgid "STUN Port"
 msgstr "Порт STUN"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:181
-msgid "Service ACLs"
-msgstr "Список доступа MiniUPnP"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:195
+msgid "Service Access Control List"
+msgstr ""
 
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Service Settings"
-msgstr "Настройки MiniUPnP"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
+msgid "Service Setup"
+msgstr "Основные Настройки"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:192
 msgid "Service lease file"
-msgstr "Файл аренды UPnP"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
+msgid "Start autonomous port mapping service"
+msgstr ""
 
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Start service"
-msgstr "Запустить службы<br />UPnP и NAT-PMP"
+msgstr ""
+
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:76
+msgctxt ""
+"The %s (%s = UPnP IGD & PCP/NAT-PMP) protocols allow clients on the local "
+"network to configure port maps/forwards on the router autonomously."
+msgid ""
+"The %s protocols allow clients on the local network to configure port maps/"
+"forwards on the router autonomously."
+msgstr ""
 
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:70
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:66
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
-msgid "There are no active port forwards."
+msgid "There are no active port maps."
 msgstr "Активные переадресации отсутствуют."
 
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:144
+msgid ""
+"To detect the public IPv4 address for unrestricted full-cone/one-to-one NATs"
+msgstr ""
+
 #: applications/luci-app-upnp/root/usr/share/luci/menu.d/luci-app-upnp.json:3
-msgid "UPnP IGD & PCP/NAT-PMP"
-msgstr "UPnP IGD и PCP/NAT-PMP"
+msgid "UPnP IGD & PCP"
+msgstr "UPnP IGD и PCP"
 
 #: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:75
 msgid "UPnP IGD & PCP/NAT-PMP Service"
 msgstr "Сервис UPnP IGD и PCP/NAT-PMP"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:76
-msgid ""
-"UPnP IGD & PCP/NAT-PMP allows clients on the local network to automatically "
-"configure port forwards on the router. Also called Universal Plug and Play."
-msgstr ""
-"UPnP позволяет клиентам в локальной сети автоматически настраивать "
-"маршрутизатор."
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:129
+msgid "UPnP IGDv1 compatibility mode"
+msgstr "UPnP IGDv1 режим"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:60
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:56
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:100
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:53
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:97
 msgid "Unknown"
 msgstr "Неизвестный"
 
@@ -224,11 +248,34 @@ msgstr "Неизвестный"
 msgid "Upload speed"
 msgstr "Внешнее соединение"
 
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:170
-msgid "Use STUN"
-msgstr "Используйте STUN"
-
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:137
-#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:140
-msgid "Value in KByte/s, informational only"
-msgstr "Значение в КБ/с, только для информации"
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
+msgctxt "Use %s (%s = STUN)"
+msgid "Use %s"
+msgstr "Использовать %s"
+
+#~ msgid ""
+#~ "ACLs specify which external ports can be forwarded to which client "
+#~ "addresses and ports, IPv6 always allowed."
+#~ msgstr ""
+#~ "ACL определяет, какие внешние порты могут быть перенаправлены на те или "
+#~ "иные клиентские адреса и порты, IPv6 всегда разрешен."
+
+#~ msgid "Clean rules interval"
+#~ msgstr "Интервал очистки правил"
+
+#~ msgid "Clean rules threshold"
+#~ msgstr "Порог очистки правил"
+
+#~ msgid "Host"
+#~ msgstr "Устройство"
+
+#~ msgid ""
+#~ "UPnP IGD & PCP/NAT-PMP allows clients on the local network to "
+#~ "automatically configure port forwards on the router. Also called "
+#~ "Universal Plug and Play."
+#~ msgstr ""
+#~ "UPnP позволяет клиентам в локальной сети автоматически настраивать "
+#~ "маршрутизатор."
+
+#~ msgid "Value in KByte/s, informational only"
+#~ msgstr "Значение в КБ/с, только для информации"