1 files changed, 62 insertions, 50 deletions
diff --git a/applications/luci-app-upnp/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po
index a99441343c..a140142ecb 100644
--- a/applications/luci-app-upnp/po/ru/upnp.po
+++ b/applications/luci-app-upnp/po/ru/upnp.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:168
 msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
@@ -24,163 +24,170 @@ msgstr ""
 "Список доступа задает внешние порты для перенаправления на внутренние адреса "
 "и порты."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:188
 msgid "Action"
 msgstr "Действие"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:110
 msgid "Active UPnP Redirects"
 msgstr "Активные UPnP-переадресации"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:13
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:116
 msgid "Advanced Settings"
 msgstr "Дополнительные настройки"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:39
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:128
 msgid "Advertise as IGDv1 device instead of IGDv2"
 msgstr "Объявить как IGDv1 устройство вместо IGDv2"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:36
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:125
 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr "Разрешить перенаправление только для запрашивающих IP-адресов."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:147
 msgid "Announced model number"
 msgstr "Объявить номер модели"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:146
 msgid "Announced serial number"
 msgstr "Объявить серийный номер"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:157
 msgid "Clean rules interval"
 msgstr "Интервал очистки правил"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:65
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:153
 msgid "Clean rules threshold"
 msgstr "Порог очистки правил"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:44
+#: 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:82
 msgid "Client Address"
 msgstr "Адрес клиента"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:46
+#: 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:84
 msgid "Client Port"
 msgstr "Порт клиента"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
-msgid "Collecting data..."
-msgstr "Сбор данных..."
-
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:174
 msgid "Comment"
 msgstr "Комментарий"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:64
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:59
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:103
 msgid "Delete"
 msgstr "Удалить"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
+#: 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:85
 msgid "Description"
 msgstr "Описание"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:145
 msgid "Device UUID"
 msgstr "UUID устройства"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:133
 msgid "Downlink"
 msgstr "Внутреннее соединение"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:127
 msgid "Enable IGDv1 mode"
 msgstr "IGDv1 режим"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:122
 msgid "Enable NAT-PMP functionality"
 msgstr "Включить NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:121
 msgid "Enable UPnP functionality"
 msgstr "Включить UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:130
 msgid "Enable additional logging"
 msgstr "Дополнительное журналирование"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:35
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:124
 msgid "Enable secure mode"
 msgstr "Защищённый режим"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:43
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:81
 msgid "External Port"
 msgstr "Внешний порт"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:90
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:176
 msgid "External ports"
 msgstr "Внешние порты"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:115
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
+#: 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:83
 msgid "Host"
 msgstr "Хост"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:94
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:180
 msgid "Internal addresses"
 msgstr "Внутренние адреса"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:98
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:184
 msgid "Internal ports"
 msgstr "Внутренние порты"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:80
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:167
 msgid "MiniUPnP ACLs"
 msgstr "Список доступа MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:10
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:113
 msgid "MiniUPnP settings"
 msgstr "Настройки MiniUPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:61
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:149
 msgid "Notify interval"
 msgstr "Интервал уведомления"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:50
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:139
 msgid "Port"
 msgstr "Порт"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:161
 msgid "Presentation URL"
 msgstr "Задать URL-адрес"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:41
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:80
 msgid "Protocol"
 msgstr "Протокол"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:131
 msgid "Puts extra debugging information into the system log"
 msgstr "Добавлять дополнительную отладочную информацию в системный журнал."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:55
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:143
 msgid "Report system instead of daemon uptime"
 msgstr "Сообщать время работы системы вместо службы"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:15
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:118
 msgid "Start UPnP and NAT-PMP service"
 msgstr "Запустить службы<br />UPnP и NAT-PMP"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:32
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:68
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:63
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:107
 msgid "There are no active redirects."
 msgstr "Активные переадресации отсутствуют."
 
-#: applications/luci-app-upnp/luasrc/controller/upnp.lua:14
+#: applications/luci-app-upnp/luasrc/controller/upnp.lua:12
 msgid "UPnP"
 msgstr "UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:6
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:73
 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
@@ -188,23 +195,28 @@ msgstr ""
 "UPnP позволяет клиентам в локальной сети автоматически настраивать "
 "маршрутизатор."
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:76
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:164
 msgid "UPnP lease file"
 msgstr "Файл аренды UPnP"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:5
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:72
 msgid "Universal Plug & Play"
 msgstr "Universal Plug & Play"
 
-#: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/status/include/80_upnp.js:58
+#: 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 "Неизвестно"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
+#: applications/luci-app-upnp/htdocs/luci-static/resources/view/upnp/upnp.js:136
 msgid "Uplink"
 msgstr "Внешнее соединение"
 
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
-#: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
+#: 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:137
 msgid "Value in KByte/s, informational only"
 msgstr "Значение в КБ/с, только для информации."
+
+#~ msgid "Collecting data..."
+#~ msgstr "Сбор данных..."