summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/po/es/adblock.po74
-rw-r--r--applications/luci-app-advanced-reboot/po/es/advanced-reboot.po38
-rw-r--r--applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po30
-rw-r--r--applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po30
-rw-r--r--applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot30
-rw-r--r--applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po30
-rw-r--r--applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po30
-rw-r--r--applications/luci-app-aria2/po/es/aria2.po315
-rw-r--r--applications/luci-app-banip/po/es/banip.po242
-rw-r--r--applications/luci-app-banip/po/templates/banip.pot166
-rw-r--r--applications/luci-app-ddns/po/es/ddns.po14
-rw-r--r--applications/luci-app-firewall/po/ca/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/cs/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/de/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/el/firewall.po174
-rw-r--r--applications/luci-app-firewall/po/en/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/es/firewall.po206
-rw-r--r--applications/luci-app-firewall/po/fr/firewall.po186
-rw-r--r--applications/luci-app-firewall/po/he/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/hu/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/it/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/ja/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/ko/firewall.po186
-rw-r--r--applications/luci-app-firewall/po/ms/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/no/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/pl/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/pt-br/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/pt/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/ro/firewall.po183
-rw-r--r--applications/luci-app-firewall/po/ru/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/sk/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/sv/firewall.po198
-rw-r--r--applications/luci-app-firewall/po/templates/firewall.pot169
-rw-r--r--applications/luci-app-firewall/po/tr/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/uk/firewall.po445
-rw-r--r--applications/luci-app-firewall/po/vi/firewall.po165
-rw-r--r--applications/luci-app-firewall/po/zh-cn/firewall.po204
-rw-r--r--applications/luci-app-firewall/po/zh-tw/firewall.po204
-rw-r--r--applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po10
-rw-r--r--applications/luci-app-mwan3/po/es/mwan3.po16
-rw-r--r--applications/luci-app-ntpc/po/es/ntpc.po14
-rw-r--r--applications/luci-app-olsr/luasrc/controller/olsr.lua8
-rw-r--r--applications/luci-app-simple-adblock/Makefile2
-rw-r--r--applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua47
-rw-r--r--applications/luci-app-simple-adblock/po/es/simple-adblock.po132
-rw-r--r--applications/luci-app-simple-adblock/po/ja/simple-adblock.po78
-rw-r--r--applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po81
-rw-r--r--applications/luci-app-simple-adblock/po/pt/simple-adblock.po78
-rw-r--r--applications/luci-app-simple-adblock/po/ru/simple-adblock.po75
-rw-r--r--applications/luci-app-simple-adblock/po/sv/simple-adblock.po58
-rw-r--r--applications/luci-app-simple-adblock/po/templates/simple-adblock.pot49
-rw-r--r--applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po73
-rw-r--r--applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po73
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua21
-rw-r--r--applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua14
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua2
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua4
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua176
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua6
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua94
-rw-r--r--applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua75
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua8
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua8
-rw-r--r--applications/luci-app-travelmate/po/es/travelmate.po14
-rw-r--r--applications/luci-app-udpxy/po/es/udpxy.po81
-rw-r--r--applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua8
-rw-r--r--applications/luci-app-vpnbypass/po/de/vpnbypass.po56
-rw-r--r--applications/luci-app-vpnbypass/po/es/vpnbypass.po62
-rw-r--r--applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po56
-rw-r--r--applications/luci-app-vpnbypass/po/ru/vpnbypass.po51
-rw-r--r--applications/luci-app-vpnbypass/po/templates/vpnbypass.pot51
-rw-r--r--applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po56
-rw-r--r--applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po51
-rw-r--r--applications/luci-app-wifischedule/po/es/wifischedule.po8
-rw-r--r--applications/luci-app-wireguard/po/es/wireguard.po4
75 files changed, 3672 insertions, 4416 deletions
diff --git a/applications/luci-app-adblock/po/es/adblock.po b/applications/luci-app-adblock/po/es/adblock.po
index c7c1e47bd3..a211af6d7c 100644
--- a/applications/luci-app-adblock/po/es/adblock.po
+++ b/applications/luci-app-adblock/po/es/adblock.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-02-22 16:32-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -68,7 +68,7 @@ msgstr "Lista negra"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
msgid "Blacklist File"
-msgstr ""
+msgstr "Archivo de lista negra"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
msgid "Blocked DNS Queries"
@@ -127,11 +127,11 @@ msgstr "DNS Backend (Directorio DNS)"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
msgid "DNS Backend, DNS Directory"
-msgstr ""
+msgstr "Servidor DNS, Directorio DNS"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
msgid "DNS Blocking Variant"
-msgstr ""
+msgstr "Variante de bloqueo de DNS"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
msgid "DNS Directory"
@@ -139,11 +139,11 @@ msgstr "Directorio DNS"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
msgid "DNS File Reset"
-msgstr ""
+msgstr "Restablecimiento de archivos DNS"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
msgid "DNS Inotify"
-msgstr ""
+msgstr "DNS Inotify"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
@@ -152,7 +152,7 @@ msgstr "Informe de consulta de DNS"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
msgid "DNS Variant, DNS File Reset"
-msgstr ""
+msgstr "Variante DNS, Restablecimiento de archivos DNS"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
@@ -168,18 +168,24 @@ msgid ""
"Disable adblock triggered restarts and the 'DNS File Reset' for dns backends "
"with autoload features."
msgstr ""
+"Deshabilite los reinicios activados por adblock y el 'Restablecimiento de "
+"archivos DNS' para back-end dns con funciones de carga automática."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
msgid ""
"Disable the toplevel domain compression, if the number of blocked domains is "
"greater than this threshold."
msgstr ""
+"Deshabilite la compresión de dominio de nivel superior, si el número de "
+"dominios bloqueados es mayor que este umbral."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid ""
"Dnsmasq also supports 'null' block variants, which may provide better "
"response times."
msgstr ""
+"Dnsmasq también admite variantes de bloque 'nulo', que pueden proporcionar "
+"mejores tiempos de respuesta."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
@@ -202,27 +208,27 @@ msgstr "Utilidad de descarga (Biblioteca SSL)"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
msgid "E-Mail Notification"
-msgstr ""
+msgstr "Notificación del E-Mail"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
msgid "E-Mail Notification Count"
-msgstr ""
+msgstr "Conteo de notificaciones por E-Mail"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
msgid "E-Mail Profile"
-msgstr ""
+msgstr "Perfil del E-Mail"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
msgid "E-Mail Receiver Address"
-msgstr ""
+msgstr "Dirección del destinatario del E-Mail"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
msgid "E-Mail Sender Address"
-msgstr ""
+msgstr "Dirección del remitente del E-Mail"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
msgid "E-Mail Topic"
-msgstr ""
+msgstr "Tema del E-Mail"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
msgid "Edit Blacklist"
@@ -300,7 +306,7 @@ msgstr "Forzar DNS local"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:170
msgid "Full path to the blacklist file."
-msgstr ""
+msgstr "Ruta completa al archivo de la lista negra."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
msgid "Full path to the whitelist file."
@@ -348,6 +354,8 @@ msgid ""
"List of supported DNS blocking variants. By default 'nxdomain' will be used "
"for all DNS backends."
msgstr ""
+"Lista de variantes de bloqueo de DNS compatibles. Por defecto, 'nxdomain' se "
+"usará para todos los servidores DNS."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:44
msgid "List of supported and fully pre-configured download utilities."
@@ -362,7 +370,7 @@ msgstr "Cargando"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
msgid "Local FW/DNS Ports"
-msgstr ""
+msgstr "Puertos locales FW/DNS"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:22
msgid "Logfile"
@@ -375,6 +383,8 @@ msgstr "Servicio con prioridad baja"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:256
msgid "Mail profile used in 'msmtp' for adblock notification E-Mails."
msgstr ""
+"Perfil de correo utilizado en 'msmtp' para notificaciones de E-Mails de "
+"adblock."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
msgid "Max. Download Queue"
@@ -445,16 +455,20 @@ msgid ""
"Raise the minimum notification count, to get E-Mails if the overall count is "
"less or equal to the given limit (default 0),"
msgstr ""
+"Aumente el recuento mínimo de notificaciones para obtener E-Mails si el "
+"recuento general es menor o igual al límite dado (valor predeterminado 0),"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
msgid "Receiver address for adblock notification E-Mails."
-msgstr ""
+msgstr "Dirección del receptor para la notificación de bloqueos electrónicos."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, applies to "
"udp and tcp protocol on ports 53, 853 and 5353."
msgstr ""
+"Redireccionar todas las consultas DNS desde la zona 'lan' al resolvedor "
+"local, se aplica al protocolo udp y tcp en los puertos 53, 853 y 5353."
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:28
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:39
@@ -515,6 +529,8 @@ msgid ""
"Resets the final DNS blockfile 'adb_list.overall' after loading through the "
"DNS backend."
msgstr ""
+"Restablece el archivo de bloque DNS final 'adb_list.overall' después de "
+"cargarlo a través del backend de DNS."
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:37
msgid "Resume"
@@ -539,10 +555,12 @@ msgid ""
"Send notification E-Mails in case of a processing error or if domain count "
"is &le; 0."
msgstr ""
+"Enviar notificaciones por E-Mail en caso de un error de procesamiento o si "
+"el recuento de dominios es &le 0."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:246
msgid "Sender address for adblock notification E-Mails."
-msgstr ""
+msgstr "Dirección del remitente para los E-Mails de notificación de adblock."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:110
msgid ""
@@ -557,11 +575,15 @@ msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '4')."
msgstr ""
+"Tamaño de la cola de descarga para manejar descargas &amp; procesamiento de "
+"la lista en paralelo (predeterminado '4')."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
msgid ""
"Space separated list of firewall ports which should be redirected locally."
msgstr ""
+"Lista de puertos de firewall separados por espacios que deben redirigirse "
+"localmente."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
@@ -590,19 +612,25 @@ msgstr "Suspender / Reanudar Adblock"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:186
msgid "TLD Compression Threshold"
-msgstr ""
+msgstr "Umbral de compresión de TLD"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid ""
"Target directory for adblock source backups. Default is '/tmp', please use "
"preferably a non-volatile disk if available."
msgstr ""
+"Directorio de destino para copias de seguridad de origen de adblock. El "
+"valor predeterminado es '/tmp', utilice preferiblemente un disco no volátil "
+"si está disponible."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid ""
"Target directory for dns related report files. Default is '/tmp', please use "
"preferably a non-volatile disk if available."
msgstr ""
+"Directorio de destino para archivos de informes relacionados con dns. El "
+"valor predeterminado es '/tmp', utilice preferiblemente un disco no volátil "
+"si está disponible."
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
msgid "Target directory for the generated blocklist 'adb_list.overall'."
@@ -667,6 +695,8 @@ msgid ""
"This option saves an enormous amount of storage space, but starts a small "
"ubus/adblock monitor in the background."
msgstr ""
+"Esta opción ahorra una enorme cantidad de espacio de almacenamiento, pero "
+"inicia un pequeño monitor ubus/adblock en segundo plano."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
@@ -687,7 +717,7 @@ msgstr "Top 10 de informes"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:251
msgid "Topic for adblock notification E-Mails."
-msgstr ""
+msgstr "Tema para la notificación de bloqueos de E-Mails."
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:268
msgid "Total DNS Queries"
@@ -722,6 +752,8 @@ msgid ""
"e.g. to receive an E-Mail notification with every adblock run set this value "
"to 200000."
msgstr ""
+"p.ej. para recibir una notificación por E-Mail con cada ejecución de bloque "
+"de anuncios, establezca este valor en 200000."
#~ msgid "'Jail' Blocklist Creation"
#~ msgstr "Creación de listas de bloqueo 'Jail'"
diff --git a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
index 2637b73069..582848fa59 100644
--- a/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/es/advanced-reboot.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:29-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -49,7 +49,7 @@ msgstr "ERROR:"
msgid "Firmware/OS (Kernel)"
msgstr "Firmware"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "Sin acceso a fw_printenv o fw_printenv!"
@@ -81,19 +81,19 @@ msgstr "Reinicie el dispositivo a una partición alternativa"
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:50
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:74
msgid "Reboot to alternative partition..."
-msgstr "Reiniciar a partición alternativa ..."
+msgstr "Reiniciar a la partición alternativa ..."
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:45
#: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:69
msgid "Reboot to current partition"
msgstr "Reiniciar a la partición actual"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "Reiniciando..."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "Apagando..."
@@ -101,7 +101,7 @@ msgstr "Apagando..."
msgid "Status"
msgstr "Estado"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -113,7 +113,7 @@ msgstr ""
"sea necesario renovar la dirección de su computadora para llegar al "
"dispositivo nuevamente, dependiendo de su configuración."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -126,7 +126,7 @@ msgstr ""
"computadora para llegar al dispositivo nuevamente, dependiendo de su "
"configuración."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -138,29 +138,29 @@ msgstr ""
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "No se puede encontrar la partición de bandera de arranque dual."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "No se puede obtener la variable de entorno de firmware"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr ""
"No se puede establecer la entrada de la partición del indicador de inicio "
"dual para la partición"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "No se puede establecer la variable de entorno de firmware"
@@ -214,9 +214,9 @@ msgstr "Advertencia: ¡Este sistema no admite el apagado!"
msgid "Warning: Unable to obtain device information!"
msgstr "Advertencia: ¡No se puede obtener información del dispositivo!"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr "a"
diff --git a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
index 06e95ae159..5d66917ed1 100644
--- a/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ru/advanced-reboot.po
@@ -50,7 +50,7 @@ msgstr "ОШИБКА:"
msgid "Firmware/OS (Kernel)"
msgstr "Прошивка/ОС (Ядро)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "Нет доступа к fw_printenv или fw_printenv!"
@@ -89,12 +89,12 @@ msgstr "Перезагрузить до альтернативного разд
msgid "Reboot to current partition"
msgstr "Перезагрузка к текущему разделу"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "Перезагрузка..."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "Отключается..."
@@ -102,7 +102,7 @@ msgstr "Отключается..."
msgid "Status"
msgstr "Состояние"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -114,7 +114,7 @@ msgstr ""
"снова. Возможно, потребуется обновить адрес компьютера для повторного "
"доступа к устройству в зависимости от ваших настроек."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -126,7 +126,7 @@ msgstr ""
"установить соединение снова. Возможно, потребуется обновить адрес компьютера "
"для повторного доступа к устройству в зависимости от ваших настроек."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -138,27 +138,27 @@ msgstr ""
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "Невозможно найти Dual Boot раздел."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "Невозможно получить переменную среды прошивки"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr "Невозможно использовать Dual Boot раздел."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "Невозможно установить переменную среды прошивки"
@@ -211,10 +211,10 @@ msgstr "Внимание: Эта система не поддерживает о
msgid "Warning: Unable to obtain device information!"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
index fdb5a84451..a793c24e99 100644
--- a/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/sv/advanced-reboot.po
@@ -38,7 +38,7 @@ msgstr ""
msgid "Firmware/OS (Kernel)"
msgstr "Inre mjukvara/OS (Kärna)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr ""
@@ -77,12 +77,12 @@ msgstr "Starta om till alternativ partition..."
msgid "Reboot to current partition"
msgstr "Starta om till nuvarande partition"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "Startar om..."
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "Stänger av..."
@@ -90,7 +90,7 @@ msgstr "Stänger av..."
msgid "Status"
msgstr "Status"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -98,7 +98,7 @@ msgid ""
"settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -106,7 +106,7 @@ msgid ""
"again, depending on your settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -118,27 +118,27 @@ msgstr ""
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr ""
@@ -181,10 +181,10 @@ msgstr "Varning: Det här systemet har inte stöd för avstängning!"
msgid "Warning: Unable to obtain device information!"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
index 8f33fc9aa4..ab1ef12ff2 100644
--- a/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
+++ b/applications/luci-app-advanced-reboot/po/templates/advanced-reboot.pot
@@ -38,7 +38,7 @@ msgstr ""
msgid "Firmware/OS (Kernel)"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr ""
@@ -77,12 +77,12 @@ msgstr ""
msgid "Reboot to current partition"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr ""
@@ -90,7 +90,7 @@ msgstr ""
msgid "Status"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -98,7 +98,7 @@ msgid ""
"settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -106,7 +106,7 @@ msgid ""
"again, depending on your settings."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -115,27 +115,27 @@ msgstr ""
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr ""
@@ -174,9 +174,9 @@ msgstr ""
msgid "Warning: Unable to obtain device information!"
msgstr ""
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr ""
diff --git a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
index c794d58b8b..a9a20e4937 100644
--- a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
@@ -48,7 +48,7 @@ msgstr "错误:"
msgid "Firmware/OS (Kernel)"
msgstr "固件/OS(内核)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "无法访问 fw_printenv 或 fw_printenv!"
@@ -87,12 +87,12 @@ msgstr "重启到备用分区…"
msgid "Reboot to current partition"
msgstr "重启到当前分区"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "正在重启…"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "正在关机…"
@@ -100,7 +100,7 @@ msgstr "正在关机…"
msgid "Status"
msgstr "状态"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -110,7 +110,7 @@ msgstr ""
"系统正在重启。<br />切勿关闭电源! DO NOT POWER OFF THE DEVICE!<br />等待数分"
"钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -121,7 +121,7 @@ msgstr ""
"<br />等待数分钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重"
"新连接。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -132,27 +132,27 @@ msgstr ""
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "无法找到双引导标志分区。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "无法获取固件环境变量"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr "无法为分区设置双引导标志分区项"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "无法设置固件环境变量"
@@ -197,9 +197,9 @@ msgstr "警告:此系统不支持关闭电源!"
msgid "Warning: Unable to obtain device information!"
msgstr "警告:无法获取设备信息!"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr "至"
diff --git a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
index 489bad2cf8..0ddcec8fd2 100644
--- a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
@@ -48,7 +48,7 @@ msgstr "錯誤:"
msgid "Firmware/OS (Kernel)"
msgstr "韌體/OS(核心)"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:113
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:114
msgid "No access to fw_printenv or fw_printenv!"
msgstr "無法訪問 fw_printenv 或 fw_printenv!"
@@ -87,12 +87,12 @@ msgstr "重啟到備用分割槽…"
msgid "Reboot to current partition"
msgstr "重啟到當前分割槽"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:92
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:164
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
msgid "Rebooting..."
msgstr "正在重啟…"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:198
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
msgid "Shutting down..."
msgstr "正在關機…"
@@ -100,7 +100,7 @@ msgstr "正在關機…"
msgid "Status"
msgstr "狀態"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:93
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:94
msgid ""
"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
"few minutes before you try to reconnect. It might be necessary to renew the "
@@ -110,7 +110,7 @@ msgstr ""
"系統正在重啟。<br />切勿關閉電源! DO NOT POWER OFF THE DEVICE!<br />等待數分"
"鍾後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 位址以重新連線。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:165
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:166
msgid ""
"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
@@ -121,7 +121,7 @@ msgstr ""
"DEVICE!<br />等待數分鐘後即可嘗試重新連線到路由。您可能需要更改計算機的 IP 地"
"址以重新連線。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:199
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:200
msgid ""
"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
"might be necessary to renew the address of your computer to reach the device "
@@ -132,27 +132,27 @@ msgstr ""
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:68
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:69
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:148
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:149
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:150
msgid "Unable to find Dual Boot Flag Partition."
msgstr "無法找到雙引導標誌分割槽。"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:120
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:121
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:134
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:122
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:135
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:136
msgid "Unable to obtain firmware environment variable"
msgstr "無法獲取韌體環境變數"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:156
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:157
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:158
msgid "Unable to set Dual Boot Flag Partition entry for partition"
msgstr "無法為分割槽設定雙引導標誌分割槽項"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "Unable to set firmware environment variable"
msgstr "無法設定韌體環境變數"
@@ -198,9 +198,9 @@ msgstr "警告:此係統不支援關閉電源!"
msgid "Warning: Unable to obtain device information!"
msgstr "警告:無法獲取裝置資訊!"
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:126
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:127
-#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:140
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:128
#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:141
+#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:142
msgid "to"
msgstr "至"
diff --git a/applications/luci-app-aria2/po/es/aria2.po b/applications/luci-app-aria2/po/es/aria2.po
index 61bd523d14..275f1b82d9 100644
--- a/applications/luci-app-aria2/po/es/aria2.po
+++ b/applications/luci-app-aria2/po/es/aria2.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:29-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.2\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -19,19 +19,19 @@ msgstr ""
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:414
msgid "Additional BT tracker"
-msgstr ""
+msgstr "Tracker BT adicional"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:419
msgid "Advanced Options"
-msgstr ""
+msgstr "Opciones avanzadas"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:169
msgid "All proxy"
-msgstr ""
+msgstr "Todos los proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:228
msgid "Append HEADERs to HTTP request header."
-msgstr ""
+msgstr "Añadir encabezados al encabezado de solicitud HTTP."
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:18
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
@@ -45,18 +45,19 @@ msgid ""
"Aria2 is a lightweight multi-protocol &amp; multi-source, cross platform "
"download utility."
msgstr ""
+"Aria2 es un multiprotocolo ligero &amp; utilidad de descarga multiplataforma."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:428
msgid "Auto save interval"
-msgstr ""
+msgstr "Intervalo de guardado automático"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:56
msgid "Basic Options"
-msgstr ""
+msgstr "Opciones avanzadas"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:276
msgid "BitTorrent Options"
-msgstr ""
+msgstr "Opciones de BitTorrent"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:335
msgid "BitTorrent listen port"
@@ -64,21 +65,23 @@ msgstr "BitTorrent escucha puerto"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:189
msgid "CA certificate"
-msgstr ""
+msgstr "Certificado CA"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:195
msgid "Certificate"
-msgstr ""
+msgstr "Certificado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:182
msgid "Check certificate"
-msgstr ""
+msgstr "Comprobar certificado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:242
msgid ""
"Close connection if download speed is lower than or equal to this "
"value(bytes per sec). 0 means has no lowest speed limit."
msgstr ""
+"Cierre la conexión si la velocidad de descarga es menor o igual a este valor "
+"(bytes por segundo). 0 significa que no tiene límite de velocidad mínima."
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:49
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:29
@@ -91,23 +94,23 @@ msgstr "Directorio de archivos de configuración"
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:21
msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:230
msgid "Connect timeout"
-msgstr ""
+msgstr "Tiempo de espera de conexión"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:19
msgid "Content of config file: <code>%s</code>"
-msgstr ""
+msgstr "Contenido del archivo de configuración: <code>%s</code>"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:29
msgid "Content of session file: <code>%s</code>"
-msgstr ""
+msgstr "Contenido del archivo de sesión: <code>%s</code>"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:341
msgid "DHT Listen port"
-msgstr ""
+msgstr "Puerto de DHT"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:87
msgid "Debug"
@@ -118,6 +121,8 @@ msgid ""
"Disable IPv6. This is useful if you have to use broken DNS and want to avoid "
"terribly slow AAAA record lookup."
msgstr ""
+"Deshabilitar IPv6. Esto es útil si tiene que usar DNS roto y desea evitar "
+"una búsqueda de registros AAAA terriblemente lenta."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:440
msgid "Disk cache"
@@ -126,51 +131,54 @@ msgstr "Caché de disco"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:259
msgid "Don't split less than 2*SIZE byte range. Possible values: 1M-1024M."
msgstr ""
+"No divida menos de 2*TAMAÑO de rango de bytes. Valores posibles: 1M-1024M."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:254
msgid "Download a file using N connections."
-msgstr ""
+msgstr "Descargue un archivo usando N conexiones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:69
msgid "Download directory"
-msgstr ""
+msgstr "Directorio de descarga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:26
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:36
msgid "Empty file."
-msgstr ""
+msgstr "Archivo vacío."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:280
msgid "Enable IPv4 DHT functionality. It also enables UDP tracker support."
msgstr ""
+"Habilite la funcionalidad DHT IPv4. También habilita el soporte de tracker "
+"UDP."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:290
msgid "Enable IPv6 DHT functionality."
-msgstr ""
+msgstr "Habilite la funcionalidad DHT IPv6 ."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:298
msgid "Enable Local Peer Discovery."
-msgstr ""
+msgstr "Habilitar el descubrimiento de pares locales."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:307
msgid "Enable Peer Exchange extension."
-msgstr ""
+msgstr "Habilite la extensión de intercambio de pares."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:442
msgid "Enable disk cache (in bytes), set 0 to disabled."
-msgstr ""
+msgstr "Habilite el caché de disco (en bytes), establezca 0 para deshabilitar."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:77
msgid "Enable logging"
-msgstr ""
+msgstr "Habilitar el registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:305
msgid "Enable peer exchange"
-msgstr ""
+msgstr "Habilitar el intercambio entre pares"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:166
msgid "Enable proxy"
-msgstr ""
+msgstr "Habilitar proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:58
msgid "Enabled"
@@ -182,7 +190,7 @@ msgstr "Error"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:44
msgid "Error: Can't find aria2c in PATH, please reinstall aria2."
-msgstr ""
+msgstr "Error: no se puede encontrar aria2c en PATH, reinstale aria2."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:482
msgid "Extra Settings"
@@ -190,25 +198,25 @@ msgstr "Configuraciones extra"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:39
msgid "Failed to load log data."
-msgstr ""
+msgstr "Error al cargar los datos del registro."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:350
msgid "False"
-msgstr ""
+msgstr "Falso"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:447
msgid "File allocation"
-msgstr ""
+msgstr "Asignación de archivos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:25
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:35
msgid "File does not exist."
-msgstr ""
+msgstr "El archivo no existe."
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:24
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:14
msgid "Files"
-msgstr ""
+msgstr "Archivos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:348
msgid "Follow torrent"
@@ -216,11 +224,11 @@ msgstr "Seguir torrent"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:38
msgid "For more information, please visit: %s"
-msgstr ""
+msgstr "Para obtener más información, visite: %s"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:460
msgid "Force save"
-msgstr ""
+msgstr "Forzar guardado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:129
msgid "Generate Randomly"
@@ -228,35 +236,35 @@ msgstr "Generar aleatoriamente"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:210
msgid "HTTP accept gzip"
-msgstr ""
+msgstr "HTTP acepta gzip"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:219
msgid "HTTP no cache"
-msgstr ""
+msgstr "HTTP sin caché"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:164
msgid "HTTP/FTP/SFTP Options"
-msgstr ""
+msgstr "Opciones HTTP/FTP/SFTP"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:227
msgid "Header"
-msgstr ""
+msgstr "Encabezamiento"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/files.lua:15
msgid "Here shows the files used by aria2."
-msgstr ""
+msgstr "Aquí se muestran los archivos utilizados por aria2."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:278
msgid "IPv4 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
+msgstr "<abbr title=\"Distributed Hash Table\">DHT</abbr> IPv4 habilitado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:288
msgid "IPv6 <abbr title=\"Distributed Hash Table\">DHT</abbr> enabled"
-msgstr ""
+msgstr "<abbr title=\"Distributed Hash Table\">DHT</abbr> IPv6 habilitado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:421
msgid "IPv6 disabled"
-msgstr ""
+msgstr "IPv6 deshabilitado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:379
msgid ""
@@ -265,6 +273,10 @@ msgid ""
"Configuring this option with your preferred download speed can increase your "
"download speed in some cases."
msgstr ""
+"Si toda la velocidad de descarga de cada torrent es inferior a SPEED, aria2 "
+"aumenta temporalmente el número de pares para intentar obtener más velocidad "
+"de descarga. Configurar esta opción con su velocidad de descarga preferida "
+"puede aumentar su velocidad de descarga en algunos casos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:88
msgid "Info"
@@ -272,53 +284,55 @@ msgstr "Información"
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:33
msgid "Installed web interface:"
-msgstr ""
+msgstr "Interfaz web instalada:"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:158
msgid "Json-RPC URL"
-msgstr ""
+msgstr "URL de Json-RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:351
msgid "Keep in memory"
-msgstr ""
+msgstr "Guardar en la memoria"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:34
msgid "Last 50 lines of log file:"
-msgstr ""
+msgstr "Últimas 50 líneas del archivo de registro:"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:36
msgid "Last 50 lines of syslog:"
-msgstr ""
+msgstr "Últimas 50 líneas de syslog:"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:62
msgid "Leave blank to use default user."
-msgstr ""
+msgstr "Déjelo en blanco para usar el usuario predeterminado."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:415
msgid "List of additional BitTorrent tracker's announce URI."
-msgstr ""
+msgstr "Lista de URI de anuncio de trackers de BitTorrent adicionales."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:488
msgid ""
"List of extra settings. Format: option=value, eg. <code>netrc-path=/tmp/."
"netrc</code>."
msgstr ""
+"Lista de configuraciones adicionales. Formato: opción=valor, p. Ej. "
+"<code>netrc-path=/tmp/.netrc</code>."
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:48
msgid "Loading"
-msgstr ""
+msgstr "Cargando"
#: applications/luci-app-aria2/luasrc/controller/aria2.lua:27
msgid "Log"
-msgstr ""
+msgstr "Registro"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:45
msgid "Log Data"
-msgstr ""
+msgstr "Dato de registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:80
msgid "Log file"
-msgstr ""
+msgstr "Archivo de registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:85
msgid "Log level"
@@ -326,7 +340,7 @@ msgstr "Nivel de registro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:240
msgid "Lowest speed limit"
-msgstr ""
+msgstr "Límite de velocidad mínima"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:94
msgid "Max concurrent downloads"
@@ -338,7 +352,7 @@ msgstr "Máxima conexiones por servidor"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:475
msgid "Max download limit"
-msgstr ""
+msgstr "Límite máximo de descarga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:253
msgid "Max number of split"
@@ -346,27 +360,27 @@ msgstr "Número máximo de división"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:367
msgid "Max open files"
-msgstr ""
+msgstr "Máx. archivos abiertos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:468
msgid "Max overall download limit"
-msgstr ""
+msgstr "Límite máximo de descarga total"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:353
msgid "Max overall upload limit"
-msgstr ""
+msgstr "Límite total máximo de carga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:372
msgid "Max peers"
-msgstr ""
+msgstr "Máx. pares"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:262
msgid "Max tries"
-msgstr ""
+msgstr "Máx. de intentos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:360
msgid "Max upload limit"
-msgstr ""
+msgstr "Límite máximo de carga"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:258
msgid "Min split size"
@@ -379,11 +393,11 @@ msgstr "Sin autenticacion"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:35
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:37
msgid "No log data."
-msgstr ""
+msgstr "No hay datos de registro."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:454
msgid "None"
-msgstr ""
+msgstr "Ninguno"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:89
msgid "Notice"
@@ -391,23 +405,24 @@ msgstr "Aviso"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
msgid "Pause"
-msgstr ""
+msgstr "Pausa"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:99
msgid "Pause download after added."
-msgstr ""
+msgstr "Pausa la descarga después de añadir."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:105
msgid "Pause downloads created as a result of metadata download."
msgstr ""
+"Pausa las descargas creadas como resultado de la descarga de metadatos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:104
msgid "Pause metadata"
-msgstr ""
+msgstr "Pausar metadatos"
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:64
msgid "Please input token length:"
-msgstr ""
+msgstr "Ingrese la longitud del token:"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:393
msgid "Prefix of peer ID"
@@ -415,19 +430,19 @@ msgstr "Prefijo de ID de par"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:203
msgid "Private key"
-msgstr ""
+msgstr "Clave privada"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:177
msgid "Proxy password"
-msgstr ""
+msgstr "Contraseña de proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:174
msgid "Proxy user"
-msgstr ""
+msgstr "Usuario de proxy"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:97
msgid "RPC Options"
-msgstr ""
+msgstr "Opciones de RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:114
msgid "RPC authentication method"
@@ -435,7 +450,7 @@ msgstr "Método de autenticación RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:140
msgid "RPC certificate"
-msgstr ""
+msgstr "Certificado de RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:122
msgid "RPC password"
@@ -447,21 +462,24 @@ msgstr "Puerto RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:149
msgid "RPC private key"
-msgstr ""
+msgstr "Clave privada de RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:133
msgid "RPC secure"
-msgstr ""
+msgstr "RPC seguro"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:126
msgid "RPC token"
-msgstr ""
+msgstr "Token RPC"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:134
msgid ""
"RPC transport will be encrypted by SSL/TLS. The RPC clients must use https "
"scheme to access the server. For WebSocket client, use wss scheme."
msgstr ""
+"El transporte RPC será encriptado por SSL/TLS. Los clientes RPC deben usar "
+"el esquema https para acceder al servidor. Para el cliente WebSocket, use el "
+"esquema wss."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:119
msgid "RPC username"
@@ -469,11 +487,11 @@ msgstr "Nombre de usuario RPC"
#: applications/luci-app-aria2/luasrc/view/aria2/log_template.htm:51
msgid "Refresh every 10 seconds."
-msgstr ""
+msgstr "Actualiza cada 10 segundos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:322
msgid "Remove unselected file"
-msgstr ""
+msgstr "Eliminar archivo no seleccionado"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:323
msgid ""
@@ -481,14 +499,17 @@ msgid ""
"Please use this option with care because it will actually remove files from "
"your disk."
msgstr ""
+"Elimina los archivos no seleccionados cuando se completa la descarga en "
+"BitTorrent. Utilice esta opción con cuidado porque en realidad eliminará los "
+"archivos de su disco."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:377
msgid "Request peer speed limit"
-msgstr ""
+msgstr "Solicitar límite de velocidad del par"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:266
msgid "Retry wait"
-msgstr ""
+msgstr "Espera de reintento"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:61
msgid "Run daemon as user"
@@ -496,13 +517,15 @@ msgstr "Ejecutar demonio como usuario"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:315
msgid "Sava metadata"
-msgstr ""
+msgstr "Guardar metadatos"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:429
msgid ""
"Save a control file(*.aria2) every N seconds. If 0 is given, a control file "
"is not saved during download."
msgstr ""
+"Guarde un archivo de control (*.aria2) cada N segundos. Si se da 0, no se "
+"guarda un archivo de control durante la descarga."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:461
msgid ""
@@ -510,12 +533,18 @@ msgid ""
"This option also saves control file in that situations. This may be useful "
"to save BitTorrent seeding which is recognized as completed state."
msgstr ""
+"Guarde la descarga en el archivo de sesión incluso si la descarga se ha "
+"completado o eliminado. Esta opción también guarda el archivo de control en "
+"esas situaciones. Esto puede ser útil para guardar la siembra de BitTorrent "
+"que se reconoce como estado completado."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:435
msgid ""
"Save error/unfinished downloads to session file every N seconds. If 0 is "
"given, file will be saved only when aria2 exits."
msgstr ""
+"Guarde el error/descargas inacabadas en el archivo de sesión cada N "
+"segundos. Si se da 0, el archivo se guardará solo cuando salga aria2."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:316
msgid ""
@@ -523,26 +552,30 @@ msgid ""
"BitTorrent Magnet URI is used. The file name is hex encoded info hash with "
"suffix \".torrent\"."
msgstr ""
+"Guardar metadatos como archivo \".torrent\". Esta opción solo tiene efecto "
+"cuando se utiliza el URI de imán de BitTorrent. El nombre del archivo es "
+"hash de información codificado hexadecimal con sufijo \".torrent\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:434
msgid "Save session interval"
-msgstr ""
+msgstr "Guardar intervalo de sesión"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:330
msgid "Seed previously downloaded files without verifying piece hashes."
msgstr ""
+"Sembrar archivos descargados previamente sin verificar hashes de piezas."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:401
msgid "Seed ratio"
-msgstr ""
+msgstr "Proporción de semilla"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:408
msgid "Seed time"
-msgstr ""
+msgstr "Tiempo de semilla"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:329
msgid "Seed unverified"
-msgstr ""
+msgstr "Semilla sin verificar"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:211
msgid ""
@@ -550,6 +583,9 @@ msgid ""
"if remote server responds with <code>Content-Encoding: gzip</code> or "
"<code>Content-Encoding: deflate</code>."
msgstr ""
+"Enviar <code>Aceptar: deflate, gzip</code> encabezado de solicitud e inflar "
+"respuesta si el servidor remoto responde con <code>Content-Encoding: gzip</"
+"code> o <code Content-Encoding: deflate</code>."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:220
msgid ""
@@ -558,6 +594,10 @@ msgid ""
"you can add Cache-Control header with a directive you like using \"Header\" "
"option."
msgstr ""
+"Envíe el encabezado <code>Cache-Control: no-cache</code> y <code>Pragma: no-"
+"cache</code> para evitar el contenido en caché. Si está deshabilitado, estos "
+"encabezados no se envían y puede agregar el encabezado Cache-Control con una "
+"directiva que le guste usando la opción \"Encabezado\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:336
msgid ""
@@ -565,30 +605,44 @@ msgid ""
"\"6881-6999\" and \"6881-6889,6999\". Make sure that the specified ports are "
"open for incoming TCP traffic."
msgstr ""
+"Establezca el número de puerto TCP para las descargas de BitTorrent. Formato "
+"de aceptación: \"6881,6885\", \"6881-6999\" y \"6881-6889,6999\". Asegúrese "
+"de que los puertos especificados estén abiertos para el tráfico TCP entrante."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:342
msgid ""
"Set UDP listening port used by DHT(IPv4, IPv6) and UDP tracker. Make sure "
"that the specified ports are open for incoming UDP traffic."
msgstr ""
+"Configure el puerto de escucha UDP utilizado por DHT (IPv4, IPv6) y el "
+"tracker UDP. Asegúrese de que los puertos especificados estén abiertos para "
+"el tráfico UDP entrante."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:477
msgid ""
"Set max download speed per each download in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de descarga por cada descarga en bytes/seg. 0 "
+"significa sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:470
msgid "Set max overall download speed in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de descarga global en bytes/seg. 0 significa "
+"sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:355
msgid "Set max overall upload speed in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de carga general en bytes/seg. 0 significa "
+"sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:362
msgid ""
"Set max upload speed per each torrent in bytes/sec. 0 means unrestricted."
msgstr ""
+"Establezca la velocidad máxima de carga por cada torrent en bytes/seg. 0 "
+"significa sin restricciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:231
msgid ""
@@ -596,30 +650,35 @@ msgid ""
"server. After the connection is established, this option makes no effect and "
"\"Timeout\" option is used instead."
msgstr ""
+"Establezca el tiempo de espera de conexión en segundos para establecer la "
+"conexión al servidor HTTP/FTP/proxy. Una vez establecida la conexión, esta "
+"opción no tiene efecto y en su lugar se utiliza la opción \"Tiempo de espera"
+"\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:267
msgid "Set the seconds to wait between retries."
-msgstr ""
+msgstr "Establezca los segundos para esperar entre reintentos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:272
msgid "Set user agent for HTTP(S) downloads."
-msgstr ""
+msgstr "Establecer agente de usuario para descargas HTTP(S)."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:35
msgid "Settings"
-msgstr ""
+msgstr "Configuraciones"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:483
msgid "Settings in this section will be added to config file."
msgstr ""
+"La configuración de esta sección se agregará al archivo de configuración."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:487
msgid "Settings list"
-msgstr ""
+msgstr "Lista de configuraciones"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:161
msgid "Show URL"
-msgstr ""
+msgstr "Mostrar URL"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:448
msgid ""
@@ -631,12 +690,22 @@ msgid ""
"FAT32 because it takes almost same time as \"prealloc\" and it blocks aria2 "
"entirely until allocation finishes."
msgstr ""
+"Especifique el método de asignación de archivos. Si está utilizando sistemas "
+"de archivos más nuevos como ext4 (con soporte de extensión), btrfs, xfs o "
+"NTFS (solo compilación MinGW), \"falloc\" es su mejor opción. Asigna "
+"archivos grandes (pocos GiB) casi instantáneamente, pero puede no estar "
+"disponible si su sistema no tiene la función posix_fallocate(3). No use "
+"\"falloc\" con sistemas de archivos heredados como ext3 y FAT32 porque toma "
+"casi el mismo tiempo que \"prealloc\" y bloquea completamente aria2 hasta "
+"que finaliza la asignación."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:368
msgid ""
"Specify maximum number of files to open in multi-file BitTorrent download "
"globally."
msgstr ""
+"Especifique el número máximo de archivos para abrir en la descarga de "
+"BitTorrent de varios archivos a nivel mundial."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:409
msgid ""
@@ -644,6 +713,10 @@ msgid ""
"with this option, seeding ends when at least one of the conditions is "
"satisfied. Specifying 0 disables seeding after download completed."
msgstr ""
+"Especifique el tiempo de siembra en minutos. Si se especifica la opción "
+"\"Proporción de semillas\" junto con esta opción, la siembra finaliza cuando "
+"se cumple al menos una de las condiciones. Especificar 0 deshabilita la "
+"siembra después de completar la descarga."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:402
msgid ""
@@ -651,10 +724,16 @@ msgid ""
"RATIO. You are strongly encouraged to specify equals or more than 1.0 here. "
"Specify 0.0 if you intend to do seeding regardless of share ratio."
msgstr ""
+"Especificar proporción de participación. La semilla ha completado torrents "
+"hasta que la proporción de participación alcance la PROPORCIÓN. Le "
+"recomendamos encarecidamente que especifique iguales o más de 1.0 aquí. "
+"Especifique 0.0 si tiene la intención de sembrar, independientemente de la "
+"proporción de acciones."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:373
msgid "Specify the maximum number of peers per torrent, 0 means unlimited."
msgstr ""
+"Especifique el número máximo de pares por torrent, 0 significa ilimitado."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:394
msgid ""
@@ -663,16 +742,22 @@ msgid ""
"than 20 bytes are specified, random byte data are added to make its length "
"20 bytes."
msgstr ""
+"Especifique el prefijo de la ID del par. La ID del par en BitTorrent tiene "
+"20 bytes de longitud. Si se especifican más de 20 bytes, solo se utilizan "
+"los primeros 20 bytes. Si se especifican menos de 20 bytes, se agregan datos "
+"de bytes aleatorios para que su longitud sea de 20 bytes."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:388
msgid ""
"Stop BitTorrent download if download speed is 0 in consecutive N seconds. If "
"0 is given, this feature is disabled."
msgstr ""
+"Detenga la descarga de BitTorrent si la velocidad de descarga es 0 en N "
+"segundos consecutivos. Si se da 0, esta característica está deshabilitada."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:387
msgid "Stop timeout"
-msgstr ""
+msgstr "Detener tiempo de espera"
#: applications/luci-app-aria2/luasrc/view/aria2/settings_header.htm:48
msgid "The Aria2 service is not running."
@@ -685,18 +770,22 @@ msgstr "El servicio Aria2 se está ejecutando."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:74
msgid "The directory to store the config file, session file and DHT file."
msgstr ""
+"El directorio para almacenar el archivo de configuración, el archivo de "
+"sesión y el archivo DHT."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:70
msgid "The directory to store the downloaded file. eg. <code>/mnt/sda1</code>"
msgstr ""
+"El directorio para almacenar el archivo descargado. p.ej. <code>/mnt/sda1</"
+"code>"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:81
msgid "The file name of the log file."
-msgstr ""
+msgstr "El nombre del archivo de registro."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:249
msgid "The maximum number of connections to one server for each download."
-msgstr ""
+msgstr "El número máximo de conexiones a un servidor para cada descarga."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:281
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:291
@@ -704,10 +793,11 @@ msgstr ""
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:308
msgid "This option will be ignored if a private flag is set in a torrent."
msgstr ""
+"Esta opción se ignorará si se establece un indicador privado en un torrent."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:236
msgid "Timeout"
-msgstr ""
+msgstr "Tiempo de espera"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:117
msgid "Token"
@@ -715,7 +805,7 @@ msgstr "Token"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:349
msgid "True"
-msgstr ""
+msgstr "Verdadero"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:156
msgid "Use WebSocket"
@@ -723,13 +813,16 @@ msgstr "Utilizar websocket"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:170
msgid "Use a proxy server for all protocols."
-msgstr ""
+msgstr "Use un servidor proxy para todos los protocolos."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:190
msgid ""
"Use the certificate authorities in FILE to verify the peers. The certificate "
"file must be in PEM format and can contain multiple CA certificates."
msgstr ""
+"Use las autoridades de certificación en ARCHIVO para verificar los pares. El "
+"archivo del certificado debe estar en formato .PEM y puede contener "
+"múltiples certificados de CA."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:141
msgid ""
@@ -739,6 +832,12 @@ msgid ""
"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
"you have to specify the \"RPC private key\" as well."
msgstr ""
+"Utilice el certificado en ARCHIVO para el servidor RPC. El certificado debe "
+"estar en PKCS12 (.p12, .pfx) o en formato .PEM. <br/>Los archivos PKCS12 "
+"deben contener el certificado, una clave y, opcionalmente, una cadena de "
+"certificados adicionales. ¡Solo se pueden abrir archivos PKCS12 con una "
+"contraseña de importación en blanco!<br/>Al usar PEM, también debe "
+"especificar la \"clave privada RPC\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:196
msgid ""
@@ -748,22 +847,32 @@ msgid ""
"PKCS12 files with a blank import password can be opened!<br/>When using PEM, "
"you have to specify the \"Private key\" as well."
msgstr ""
+"Use el certificado del cliente en ARCHIVO. El certificado debe estar en "
+"PKCS12 (.p12, .pfx) o en formato PEM.<br/>Los archivos PKCS12 deben contener "
+"el certificado, una clave y, opcionalmente, una cadena de certificados "
+"adicionales. ¡Solo se pueden abrir archivos PKCS12 con una contraseña de "
+"importación en blanco!<br/>Al usar PEM, también debe especificar la \"Clave "
+"privada\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:150
msgid ""
"Use the private key in FILE for RPC server. The private key must be "
"decrypted and in PEM format."
msgstr ""
+"Use la clave privada en ARCHIVO para el servidor RPC. La clave privada debe "
+"ser descifrada y en formato .PEM."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:204
msgid ""
"Use the private key in FILE. The private key must be decrypted and in PEM "
"format. The behavior when encrypted one is given is undefined."
msgstr ""
+"Use la clave privada en ARCHIVO. La clave privada debe ser descifrada y en "
+"formato .PEM. El comportamiento cuando se da cifrado uno no está definido."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:271
msgid "User agent"
-msgstr ""
+msgstr "Agente de usuario"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:116
msgid "Username & Password"
@@ -773,6 +882,8 @@ msgstr "Nombre de usuario y contraseña"
msgid ""
"Verify the peer using certificates specified in \"CA certificate\" option."
msgstr ""
+"Verifique el par utilizando los certificados especificados en la opción "
+"\"Certificado CA\"."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:90
msgid "Warn"
@@ -786,19 +897,19 @@ msgstr "Advertir"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:471
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:478
msgid "You can append K or M."
-msgstr ""
+msgstr "Puedes agregar K o M."
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:457
msgid "falloc"
-msgstr ""
+msgstr "falloc"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:455
msgid "prealloc"
-msgstr ""
+msgstr "prealloc"
#: applications/luci-app-aria2/luasrc/model/cbi/aria2/config.lua:456
msgid "trunc"
-msgstr ""
+msgstr "trunc"
#~ msgid "\"Falloc\" is not available in all cases."
#~ msgstr "\"Falloc\" no está disponible en todos los casos."
diff --git a/applications/luci-app-banip/po/es/banip.po b/applications/luci-app-banip/po/es/banip.po
index d0985d4d6e..b8395a76a0 100644
--- a/applications/luci-app-banip/po/es/banip.po
+++ b/applications/luci-app-banip/po/es/banip.po
@@ -2,12 +2,12 @@ msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-07-25 19:35-0300\n"
+"POT-Creation-Date: 2019-07-23 22:17-0300\n"
+"PO-Revision-Date: 2019-09-17 22:33-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -20,11 +20,11 @@ msgstr "Resumen de ASN"
msgid "ASN Prefixes"
msgstr "Prefijos ASN"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
msgid "ASN/Country"
msgstr "ASN/País"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:147
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
msgid "Additional trigger delay in seconds before banIP processing begins."
msgstr ""
"Demora adicional del disparador en segundos antes de que comience el "
@@ -38,20 +38,20 @@ msgstr "Avanzado"
msgid "Automatic WAN Interface Detection"
msgstr "Detección automática de la interfaz WAN"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:96
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
msgid "Backup Directory"
msgstr "Directorio de copia de seguridad"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
-msgid "Backup Mode"
-msgstr "Modo de copia de seguridad"
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:117
msgid ""
"Blacklist auto addons are stored temporary in the IPSet and saved "
"permanently in the local blacklist. Disable this option to prevent the local "
"save."
msgstr ""
+"Los complementos automáticos de la lista negra se almacenan temporalmente en "
+"el IPSet y se guardan permanentemente en la lista negra local. Deshabilite "
+"esta opción para evitar el guardado local."
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:45
msgid "Check the current available IPSets."
@@ -68,28 +68,19 @@ msgstr ""
msgid "Country Resources"
msgstr "Recursos del país"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:112
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in 'backup mode'."
-msgstr ""
-"Cree copias de seguridad de listas de bloqueo comprimidas, se utilizarán en "
-"caso de errores de descarga o durante el inicio en el \"modo de copia de "
-"seguridad\"."
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:94
msgid "DNS Chain"
msgstr "Cadena de DNS"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
msgid "DST Target IPv4"
msgstr "Objetivo DST IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:214
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
msgid "DST Target IPv6"
msgstr "Objetivo DST IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:74
msgid "Description"
msgstr "Descripción"
@@ -101,15 +92,7 @@ msgstr ""
"Deshabilitar la detección automática de WAN y seleccione sus interfaces "
"preferidas manualmente."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:123
-msgid ""
-"Do not automatically update blocklists during startup, use their backups "
-"instead."
-msgstr ""
-"No actualice automáticamente las listas de bloqueo durante el inicio, use "
-"sus copias de seguridad en su lugar."
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:152
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
msgid "Download Options"
msgstr "Opciones de descarga"
@@ -117,7 +100,7 @@ msgstr "Opciones de descarga"
msgid "Download Utility"
msgstr "Utilidad de descarga"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:105
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
msgid "Download Utility (SSL Library)"
msgstr "Utilidad de descarga (Librería SSL)"
@@ -133,15 +116,11 @@ msgstr "Editar configuración"
msgid "Edit Whitelist"
msgstr "Editar lista blanca"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:111
-msgid "Enable Blocklist Backup"
-msgstr "Habilitar copia de seguridad de lista de bloqueo"
-
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
msgid "Enable banIP"
msgstr "Habilitar banIP"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:101
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:86
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilite el registro de depuración detallado en caso de cualquier error de "
@@ -151,7 +130,7 @@ msgstr ""
msgid "Enter IP/CIDR/ASN/ISO"
msgstr "Ingrese IP/CIDR/ASN/ISO"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
msgid "Extra Options"
msgstr "Opciones extra"
@@ -163,7 +142,7 @@ msgstr ""
"Para obtener más información <a href=\"%s\" target=\"_blank\">consulte la "
"documentación en línea</a>"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -179,18 +158,18 @@ msgstr "Geolocalización"
msgid "IANA Information"
msgstr "Información IANA"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:60
-msgid "IP Blocklist Sources"
-msgstr "Fuentes de lista de bloqueo de IP"
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:91
msgid "IP/ASN Mapping"
msgstr "Asignación de IP/ASN"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:111
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:132
msgid "IPSet Information"
msgstr "Información de IPSet"
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:58
+msgid "IPSet Sources"
+msgstr "Fuentes de IPSet"
+
#: applications/luci-app-banip/luasrc/controller/banip.lua:18
msgid "IPSet-Lookup"
msgstr "Búsqueda de IPSet"
@@ -206,23 +185,23 @@ msgstr ""
msgid "Interface Selection"
msgstr "Selección de interfaz"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:160
msgid "LAN Forward Chain IPv4"
msgstr "Cadena de reenvío LAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:192
msgid "LAN Forward Chain IPv6"
msgstr "Cadena de reenvío LAN IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:155
msgid "LAN Input Chain IPv4"
msgstr "Cadena de entrada LAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:198
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:187
msgid "LAN Input Chain IPv6"
msgstr "Cadena de entrada LAN IPv6"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:117
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
msgid "Last Run"
msgstr "Último arranque"
@@ -236,7 +215,7 @@ msgstr ""
msgid "Load"
msgstr "Cargar"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:60
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
msgid "Loading"
msgstr "Cargando"
@@ -245,32 +224,28 @@ msgstr "Cargando"
msgid "Loading ..."
msgstr "CArgando..."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
msgid "Local Save Blacklist Addons"
-msgstr ""
+msgstr "Complementos locales para guardar la lista negra"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:139
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:121
msgid "Local Save Whitelist Addons"
-msgstr ""
+msgstr "Complementos locales para guardar la lista blanca"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
msgid "Low Priority Service"
msgstr "Servicio de baja prioridad"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:127
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
msgid "Max. Download Queue"
msgstr "Máx. cola de descarga"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
-msgstr "No"
-
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:65
msgid "No response!"
msgstr "¡Ninguna respuesta!"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:98
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -300,34 +275,43 @@ msgstr "Edite este archivo directamente en una sesión de terminal."
msgid "RIPE-Lookup"
msgstr "Buscar RIPE"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:16
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
+msgid "Refresh"
+msgstr "Actualizar"
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:151
+msgid "Refresh IPSets"
+msgstr "Actualizar IPSets"
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:21
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:160
msgid "Reload"
msgstr "Recargar"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:124
-msgid "Reload IPSets"
-msgstr "Recargar IPSets"
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:158
+msgid "Reload IPSet Sources"
+msgstr "Recargar las fuentes de IPSet"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:91
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
msgid "Runtime Information"
msgstr "Información de tiempo de ejecución"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:176
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:165
msgid "SRC Target IPv4"
msgstr "Objetivo SRC IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:208
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:197
msgid "SRC Target IPv6"
msgstr "Objetivo SRC IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:67
msgid "SRC/DST"
msgstr "SRC/DST"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:63
-msgid "SSL req."
-msgstr "SSL requerido."
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:109
+msgid "SSH Daemon"
+msgstr "Demonio SSH"
#: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
#: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:26
@@ -335,7 +319,17 @@ msgstr "SSL requerido."
msgid "Save"
msgstr "Guardar"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:105
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:110
+msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
+msgstr ""
+"Seleccione el demonio SSH para el análisis del archivo de registro, para "
+"detectar eventos de intrusión."
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+msgid "Select the used start type during boot."
+msgstr "Seleccione el tipo de inicio utilizado durante el arranque."
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:90
msgid ""
"Set the nice level to 'low priority' and banIP background processing will "
"take less resources from the system."
@@ -347,7 +341,7 @@ msgstr ""
msgid "Show only set member with packet counter &gt; 0"
msgstr "Mostrar solo el miembro establecido con el contador de paquetes &gt; 0"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:103
msgid ""
"Size of the download queue to handle downloads &amp; IPset processing in "
"parallel (default '4')."
@@ -355,7 +349,7 @@ msgstr ""
"Tamaño de la cola de descarga para manejar descargas &amp; Procesamiento de "
"IPset en paralelo (predeterminado es '4')."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:153
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
msgid ""
"Special options for the selected download utility, e.g. '--timeout=20 --no-"
"check-certificate -O'."
@@ -363,13 +357,18 @@ msgstr ""
"Opciones especiales para la utilidad de descarga seleccionada, por ejemplo, "
"'--timeout=20 --no-check-certificate -O'."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+msgid "Start Type"
+msgstr "Tipo de inicio"
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
msgid ""
-"Target directory for banIP backups. Please use preferably a non-volatile "
-"disk, e.g. an external usb stick."
+"Target directory for banIP backups. Default is '/tmp', please use preferably "
+"a non-volatile disk if available."
msgstr ""
-"Directorio de destino para las copias de seguridad de banIP. Utilice "
-"preferiblemente un disco no volátil, por ej. una memoria usb externa."
+"Directorio de destino para copias de seguridad de banIP. El valor "
+"predeterminado es '/tmp', utilice preferiblemente un disco no volátil si "
+"está disponible."
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
msgid ""
@@ -394,7 +393,7 @@ msgid "The syslog output, pre-filtered for banIP related messages only."
msgstr ""
"La salida de syslog, prefiltrada solo para mensajes relacionados con banIP."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:106
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
"Este cambio requiere una parada/reinicio manual del servicio para que tenga "
@@ -484,11 +483,11 @@ msgstr ""
"Este formulario le permite modificar el contenido del archivo de "
"configuración de banIP principal (/etc/config/banip)."
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
msgid "Trigger Delay"
msgstr "Retardo de disparo"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:85
msgid "Verbose Debug Logging"
msgstr "Registro de depuración detallado"
@@ -496,58 +495,99 @@ msgstr "Registro de depuración detallado"
msgid "View Logfile"
msgstr "Ver archivo de registro"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:150
msgid "WAN Forward Chain IPv4"
msgstr "Cadena de reenvío WAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:193
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
msgid "WAN Forward Chain IPv6"
msgstr "Cadena de reenvío WAN IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:156
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:145
msgid "WAN Input Chain IPv4"
msgstr "Cadena de entrada WAN IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
msgid "WAN Input Chain IPv6"
msgstr "Cadena de entrada WAN IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:140
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
msgid ""
"Whitelist auto addons are stored temporary in the IPSet and saved "
"permanently in the local whitelist. Disable this option to prevent the local "
"save."
msgstr ""
+"Los complementos automáticos de la lista blanca se almacenan temporalmente "
+"en el IPSet y se guardan permanentemente en la lista blanca local. "
+"Deshabilite esta opción para evitar el guardado local."
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
msgid "Whois Information"
msgstr "Información Whois"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
-msgstr "Sí"
-
#: applications/luci-app-banip/luasrc/controller/banip.lua:16
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:10
msgid "banIP"
msgstr "banIP"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:93
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
msgid "banIP Status"
msgstr "Estado de banIP"
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:99
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:120
msgid "banIP Version"
msgstr "Versión de banIP"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:61
msgid "enable IPv4"
msgstr "habilitar IPv4"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:79
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:64
msgid "enable IPv6"
msgstr "habilitar IPv6"
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:73
-msgid "n/a"
-msgstr "n/d"
+#~ msgid "Backup Mode"
+#~ msgstr "Modo de copia de seguridad"
+
+#~ msgid ""
+#~ "Create compressed blocklist backups, they will be used in case of "
+#~ "download errors or during startup in 'backup mode'."
+#~ msgstr ""
+#~ "Cree copias de seguridad de listas de bloqueo comprimidas, se utilizarán "
+#~ "en caso de errores de descarga o durante el inicio en el \"modo de copia "
+#~ "de seguridad\"."
+
+#~ msgid ""
+#~ "Do not automatically update blocklists during startup, use their backups "
+#~ "instead."
+#~ msgstr ""
+#~ "No actualice automáticamente las listas de bloqueo durante el inicio, use "
+#~ "sus copias de seguridad en su lugar."
+
+#~ msgid "Enable Blocklist Backup"
+#~ msgstr "Habilitar copia de seguridad de lista de bloqueo"
+
+#~ msgid "IP Blocklist Sources"
+#~ msgstr "Fuentes de lista de bloqueo de IP"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "Reload IPSets"
+#~ msgstr "Recargar IPSets"
+
+#~ msgid "SSL req."
+#~ msgstr "SSL requerido."
+
+#~ msgid ""
+#~ "Target directory for banIP backups. Please use preferably a non-volatile "
+#~ "disk, e.g. an external usb stick."
+#~ msgstr ""
+#~ "Directorio de destino para las copias de seguridad de banIP. Utilice "
+#~ "preferiblemente un disco no volátil, por ej. una memoria usb externa."
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
diff --git a/applications/luci-app-banip/po/templates/banip.pot b/applications/luci-app-banip/po/templates/banip.pot
index eed4393dc6..b477622eed 100644
--- a/applications/luci-app-banip/po/templates/banip.pot
+++ b/applications/luci-app-banip/po/templates/banip.pot
@@ -9,11 +9,11 @@ msgstr ""
msgid "ASN Prefixes"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
msgid "ASN/Country"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:147
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
msgid "Additional trigger delay in seconds before banIP processing begins."
msgstr ""
@@ -25,15 +25,12 @@ msgstr ""
msgid "Automatic WAN Interface Detection"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:96
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
msgid "Backup Directory"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
-msgid "Backup Mode"
-msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:117
msgid ""
"Blacklist auto addons are stored temporary in the IPSet and saved "
"permanently in the local blacklist. Disable this option to prevent the local "
@@ -53,25 +50,19 @@ msgstr ""
msgid "Country Resources"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:112
-msgid ""
-"Create compressed blocklist backups, they will be used in case of download "
-"errors or during startup in 'backup mode'."
-msgstr ""
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:94
msgid "DNS Chain"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
msgid "DST Target IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:214
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
msgid "DST Target IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:74
msgid "Description"
msgstr ""
@@ -81,13 +72,7 @@ msgid ""
"manually."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:123
-msgid ""
-"Do not automatically update blocklists during startup, use their backups "
-"instead."
-msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:152
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:141
msgid "Download Options"
msgstr ""
@@ -95,7 +80,7 @@ msgstr ""
msgid "Download Utility"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:105
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
msgid "Download Utility (SSL Library)"
msgstr ""
@@ -111,15 +96,11 @@ msgstr ""
msgid "Edit Whitelist"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:111
-msgid "Enable Blocklist Backup"
-msgstr ""
-
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
msgid "Enable banIP"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:101
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:86
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
@@ -127,7 +108,7 @@ msgstr ""
msgid "Enter IP/CIDR/ASN/ISO"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
msgid "Extra Options"
msgstr ""
@@ -137,7 +118,7 @@ msgid ""
"documentation</a>"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:129
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -151,18 +132,18 @@ msgstr ""
msgid "IANA Information"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:60
-msgid "IP Blocklist Sources"
-msgstr ""
-
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:91
msgid "IP/ASN Mapping"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:111
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:132
msgid "IPSet Information"
msgstr ""
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:58
+msgid "IPSet Sources"
+msgstr ""
+
#: applications/luci-app-banip/luasrc/controller/banip.lua:18
msgid "IPSet-Lookup"
msgstr ""
@@ -177,23 +158,23 @@ msgstr ""
msgid "Interface Selection"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:160
msgid "LAN Forward Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:203
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:192
msgid "LAN Forward Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:155
msgid "LAN Input Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:198
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:187
msgid "LAN Input Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:117
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
msgid "Last Run"
msgstr ""
@@ -206,7 +187,7 @@ msgstr ""
msgid "Load"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:60
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
msgid "Loading"
msgstr ""
@@ -215,32 +196,28 @@ msgstr ""
msgid "Loading ..."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
msgid "Local Save Blacklist Addons"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:139
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:121
msgid "Local Save Whitelist Addons"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:104
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:89
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:127
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
msgid "Max. Download Queue"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:70
-msgid "No"
-msgstr ""
-
#: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:65
msgid "No response!"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:98
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -266,33 +243,42 @@ msgstr ""
msgid "RIPE-Lookup"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:16
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
+msgid "Refresh"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:151
+msgid "Refresh IPSets"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:21
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:160
msgid "Reload"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:124
-msgid "Reload IPSets"
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:158
+msgid "Reload IPSet Sources"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:91
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:176
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:165
msgid "SRC Target IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:208
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:197
msgid "SRC Target IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:82
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:67
msgid "SRC/DST"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:63
-msgid "SSL req."
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:109
+msgid "SSH Daemon"
msgstr ""
#: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:27
@@ -301,7 +287,15 @@ msgstr ""
msgid "Save"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:105
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:110
+msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:135
+msgid "Select the used start type during boot."
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:90
msgid ""
"Set the nice level to 'low priority' and banIP background processing will "
"take less resources from the system."
@@ -311,22 +305,26 @@ msgstr ""
msgid "Show only set member with packet counter &gt; 0"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:103
msgid ""
"Size of the download queue to handle downloads &amp; IPset processing in "
"parallel (default '4')."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:153
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:142
msgid ""
"Special options for the selected download utility, e.g. '--timeout=20 --no-"
"check-certificate -O'."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:116
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
+msgid "Start Type"
+msgstr ""
+
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:97
msgid ""
-"Target directory for banIP backups. Please use preferably a non-volatile "
-"disk, e.g. an external usb stick."
+"Target directory for banIP backups. Default is '/tmp', please use preferably "
+"a non-volatile disk if available."
msgstr ""
#: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:77
@@ -346,7 +344,7 @@ msgstr ""
msgid "The syslog output, pre-filtered for banIP related messages only."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:106
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:91
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -410,11 +408,11 @@ msgid ""
"file (/etc/config/banip)."
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:146
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:128
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:85
msgid "Verbose Debug Logging"
msgstr ""
@@ -422,23 +420,23 @@ msgstr ""
msgid "View Logfile"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:161
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:150
msgid "WAN Forward Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:193
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:182
msgid "WAN Forward Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:156
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:145
msgid "WAN Input Chain IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:188
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:177
msgid "WAN Input Chain IPv6"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:140
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:122
msgid ""
"Whitelist auto addons are stored temporary in the IPSet and saved "
"permanently in the local whitelist. Disable this option to prevent the local "
@@ -449,31 +447,23 @@ msgstr ""
msgid "Whois Information"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:68
-msgid "Yes"
-msgstr ""
-
#: applications/luci-app-banip/luasrc/controller/banip.lua:16
#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:10
msgid "banIP"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:93
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
msgid "banIP Status"
msgstr ""
-#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:99
+#: applications/luci-app-banip/luasrc/view/banip/runtime.htm:120
msgid "banIP Version"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:76
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:61
msgid "enable IPv4"
msgstr ""
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:79
+#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:64
msgid "enable IPv6"
msgstr ""
-
-#: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:73
-msgid "n/a"
-msgstr ""
diff --git a/applications/luci-app-ddns/po/es/ddns.po b/applications/luci-app-ddns/po/es/ddns.po
index 9e649c2ddd..092319bb19 100644
--- a/applications/luci-app-ddns/po/es/ddns.po
+++ b/applications/luci-app-ddns/po/es/ddns.po
@@ -2,15 +2,15 @@ msgid ""
msgstr ""
"Project-Id-Version: luci-app-ddns 2.4.0-1\n"
"POT-Creation-Date: 2016-01-30 11:07+0100\n"
-"PO-Revision-Date: 2019-05-15 20:11-0300\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
+"PO-Revision-Date: 2019-09-17 22:38-0300\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Language-Team: \n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.2.3\n"
#: applications/luci-app-ddns/luasrc/view/ddns/overview_status.htm:145
msgid "&"
@@ -28,7 +28,7 @@ msgstr "-- Predeterminado --"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:53
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:264
msgid "Advanced Settings"
-msgstr "Ajustes avanzados"
+msgstr "Configuración avanzada"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:46
msgid "Allow non-public IP's"
@@ -42,7 +42,7 @@ msgstr "Aplicando cambios"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:50
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:263
msgid "Basic Settings"
-msgstr "Ajustes básicos"
+msgstr "Configuración básica"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/hints.lua:25
msgid ""
@@ -376,7 +376,7 @@ msgstr "GNU Wget usará la IP de la red dada, cURL usará la interfaz física."
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua:26
msgid "Global Settings"
-msgstr "Ajustes globales"
+msgstr "Configuración global"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:606
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:615
@@ -802,7 +802,7 @@ msgstr "No hay servicio configurado."
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:56
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/detail.lua:265
msgid "Timer Settings"
-msgstr "Ajustes del temporizador"
+msgstr "Configuración del temporizador"
#: applications/luci-app-ddns/luasrc/model/cbi/ddns/overview.lua:101
msgid "To change global settings click here"
diff --git a/applications/luci-app-firewall/po/ca/firewall.po b/applications/luci-app-firewall/po/ca/firewall.po
index b0c26cf6b0..b5b395fb9e 100644
--- a/applications/luci-app-firewall/po/ca/firewall.po
+++ b/applications/luci-app-firewall/po/ca/firewall.po
@@ -62,26 +62,14 @@ msgstr ""
msgid "Action"
msgstr "Acció"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Afegeix"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Afegeix i edita..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -93,15 +81,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ajusts avançats"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permet el reenviament des dels <em>zones d'origen</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permet el reenviament als <em>zones de destí</em>:"
@@ -114,11 +102,11 @@ msgstr "Qualsevol"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -127,19 +115,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Xarxes cobertes"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -167,8 +155,6 @@ msgid "Destination port"
msgstr "Port de destí"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zona de destí"
@@ -191,17 +177,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescriguis"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -235,7 +216,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "Habilita protecció contra la inundació SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilita el registre d'aquesta zona"
@@ -243,7 +224,7 @@ msgstr "Habilita el registre d'aquesta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -252,21 +233,15 @@ msgid "External IP address"
msgstr "Adreça IP extern"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Port extern"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona extern"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Paràmetres extres"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -274,7 +249,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -298,12 +273,12 @@ msgstr "Tallafocs - Regles de tràfic"
msgid "Firewall - Zone Settings"
msgstr "Tallafocs - Ajusts de zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Força el rastreig de connexió"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Reenvia"
@@ -375,12 +350,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Només IPv4"
@@ -389,31 +364,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Només IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Adreça IP interna"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Port intern"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita els missatges de registre"
@@ -427,11 +399,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Fixació MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Mascarada"
@@ -463,11 +435,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -475,28 +443,6 @@ msgstr "Nom"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regla de reenviament"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regla d'entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nou reenviament de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nou origen NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Només coincideix amb trànsit entrant dirigit a la adreça IP donada."
@@ -517,17 +463,8 @@ msgstr ""
"Només coincideix amb trànsit originant en el host client des del port o del "
"rang de ports d'origen donat"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Obre els ports en el encaminador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altre..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Sortida"
@@ -536,7 +473,7 @@ msgstr "Sortida"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa paràmetres addicionals al iptables. Utilitzeu-ho amb cura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -558,7 +495,7 @@ msgstr ""
"El reenviament de ports permet que els ordinadors remots en el Internet "
"connectin a un ordinador o servei específic dins del LAN privat."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -566,8 +503,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocol"
@@ -603,16 +538,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringeix la mascarada a les subxarxes de destí donades"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringeix la mascarada a les subxarxes d'origen donades"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringeix a la família d'adreces"
@@ -660,8 +595,6 @@ msgstr "Port d'origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zona d'origen"
@@ -693,8 +626,8 @@ msgstr ""
"El tallafocs crea zones a les teves interfícies de xarxa per controlar el "
"flux de tràfic de xarxa."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
"regla de reenviament es <em>unidirectional</em>, per exemple un reenviament "
"de lan a wan <em>no</em> implica permís per reenviar de wan a lan també."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -754,14 +687,6 @@ msgstr "A %s en <var>aquest dispositiu</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A l'IP d'origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Al port d'origen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -791,17 +716,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -823,7 +748,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenviaments"
@@ -833,7 +758,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accepta"
@@ -882,7 +807,7 @@ msgstr "no rastregis"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "descarta"
@@ -915,7 +840,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rebutja"
@@ -924,6 +849,12 @@ msgstr "rebutja"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -934,6 +865,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Afegeix i edita..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescriguis"
+
+#~ msgid "External zone"
+#~ msgstr "Zona extern"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regla de reenviament"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regla d'entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nou reenviament de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nou origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Obre els ports en el encaminador"
+
+#~ msgid "Other..."
+#~ msgstr "Altre..."
+
+#~ msgid "To source IP"
+#~ msgstr "A l'IP d'origen"
+
+#~ msgid "To source port"
+#~ msgstr "Al port d'origen"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada sense nom)"
diff --git a/applications/luci-app-firewall/po/cs/firewall.po b/applications/luci-app-firewall/po/cs/firewall.po
index ea0f2a8259..b465d137f7 100644
--- a/applications/luci-app-firewall/po/cs/firewall.po
+++ b/applications/luci-app-firewall/po/cs/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
msgid "Action"
msgstr "Akce"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Přidat"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Přidat a upravit"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Pokročilé nastavení"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Povolit přesměrování ze <em>zdrojových oblastí</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Povolit přesměrování do <em>zdrojových oblastí</em>:"
@@ -110,11 +98,11 @@ msgstr "Libovolné"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Pokryté sítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -162,8 +150,6 @@ msgid "Destination port"
msgstr "Cílový port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Cílová oblast"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nepřepisovat"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -230,7 +211,7 @@ msgstr "Povolit NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Povolit ochranu proti SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Povolit logování v této oblasti"
@@ -238,7 +219,7 @@ msgstr "Povolit logování v této oblasti"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -247,21 +228,15 @@ msgid "External IP address"
msgstr "Vnější IP adresa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Vnější port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Vnější zóna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Dodatečné argumenty"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -269,7 +244,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -293,12 +268,12 @@ msgstr "Firewall - Pravidla síťového provozu"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Nastavení zón"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Vynutit sledování připojení"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Přesměrování"
@@ -370,12 +345,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 a IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "pouze IPv4"
@@ -384,31 +359,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "pouze IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Vstup"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Vnitřní IP adresa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Vnitřní port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Vnitřní zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Omezit logovací zprávy"
@@ -422,11 +394,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maškárádování"
@@ -458,11 +430,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Název"
@@ -470,28 +438,6 @@ msgstr "Název"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nové pravidlo SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nové přesměrovací pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nové vstupní pravidlo"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nové přesměrování portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nový zdrojový NAT (SNAT)"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Vybrat pouze příchozí provoz, směrovaný na danou IP adresu."
@@ -512,17 +458,8 @@ msgstr ""
"Vybrat pouze příchozí provoz, pocházející ze zadaného portu nebo rozsahu "
"portů klienta."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otevřené porty na routeru"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Ostatní ..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Výstup"
@@ -531,7 +468,7 @@ msgstr "Výstup"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Předává další argumenty iptables. Používat opatrně!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -554,7 +491,7 @@ msgstr ""
"Internetu připojení k vybraným počítačům nebo službám uvnitř privátní sítě "
"LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -562,8 +499,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protokol"
@@ -600,16 +535,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Omezit maškarádování na uvedené cílové podsítě"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Omezit maškarádování na uvedené zdrojové podsítě"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Omezit na rodinu adres"
@@ -657,8 +592,6 @@ msgstr "Zdrojový port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zdrojová zóna"
@@ -690,8 +623,8 @@ msgstr ""
"Firewall vytváří zóny přes vaše síťová rozhraní za účelem řízení síťového "
"provozu."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -707,7 +640,7 @@ msgstr ""
"Přesměrovávací pravidlo je <em>jednosměrné</em>, například přesměrování z "
"lan do wan <em>nepovoluje</em> přesměrování z wan do lan (a naopak)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -750,14 +683,6 @@ msgstr "Na %s na <var>tomto zařízení</var>"
msgid "To %s, %s in %s"
msgstr "Na %s, %s v %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Na zdrojovou IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Na zdrojový port"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -787,17 +712,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -819,7 +744,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Přesměrování"
@@ -829,7 +754,7 @@ msgstr "Zóny"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "přijmout"
@@ -878,7 +803,7 @@ msgstr "nesledovat"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "zahodit"
@@ -911,7 +836,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "odmítnout"
@@ -920,6 +845,12 @@ msgstr "odmítnout"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -930,6 +861,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Přidat"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Přidat a upravit"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nepřepisovat"
+
+#~ msgid "External zone"
+#~ msgstr "Vnější zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nové pravidlo SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nové přesměrovací pravidlo"
+
+#~ msgid "New input rule"
+#~ msgstr "Nové vstupní pravidlo"
+
+#~ msgid "New port forward"
+#~ msgstr "Nové přesměrování portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nový zdrojový NAT (SNAT)"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otevřené porty na routeru"
+
+#~ msgid "Other..."
+#~ msgstr "Ostatní ..."
+
+#~ msgid "To source IP"
+#~ msgstr "Na zdrojovou IP"
+
+#~ msgid "To source port"
+#~ msgstr "Na zdrojový port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Nepojmenovaný vstup)"
diff --git a/applications/luci-app-firewall/po/de/firewall.po b/applications/luci-app-firewall/po/de/firewall.po
index 3b287bc227..23ab725a58 100644
--- a/applications/luci-app-firewall/po/de/firewall.po
+++ b/applications/luci-app-firewall/po/de/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Aktion"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hinzufügen und bearbeiten..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Erlaube Weiterleitung von <em>Quellzone</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Erlaube Weiterleitung zu <em>Zielzone</em>:"
@@ -112,11 +100,11 @@ msgstr "beliebig"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Abgedeckte Netzwerke"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -165,8 +153,6 @@ msgid "Destination port"
msgstr "Zielport"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Ziel-Zone"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nicht umschreiben"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -233,7 +214,7 @@ msgstr "NAT-Loopback aktivieren"
msgid "Enable SYN-flood protection"
msgstr "Schutz vor SYN-flood-Attacken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Protokollierung innerhalb der Zone aktivieren"
@@ -241,7 +222,7 @@ msgstr "Protokollierung innerhalb der Zone aktivieren"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Experimentelle Funktion. Nicht vollständig kompatibel mit QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Externe IP-Adresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Externer Port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Externe Zone"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Zusätzliche Argumente"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Traffic-Regeln"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Zoneneinstellungen"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Connectiontracking erzwingen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Weitergeleitet"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 und IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "nur IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "nur IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Eingehend"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Interne IP-Adresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Interner Port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Interne Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Protokollnachrichten limitieren"
@@ -425,11 +397,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS Korrektur"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "NAT aktivieren"
@@ -461,11 +433,7 @@ msgstr "Monatstage"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -473,28 +441,6 @@ msgstr "Name"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Neue SNAT-Regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Neue Weiterleitungsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Neue eingehende Regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Neue Portweiterleitung"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Neues SNAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Selektiere nur Traffic der an die angegebene IP-Adresse gerichtet ist."
@@ -513,17 +459,8 @@ msgid ""
"range on the client host"
msgstr "Selektiere nur Traffic von den angegebenen Quell-Ports auf dem Client."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports auf dem Router öffnen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Anderes..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Ausgehend"
@@ -534,7 +471,7 @@ msgstr ""
"Gibt zusätzliche Kommandozeilenargumente an iptables weiter. Mit Vorsicht "
"benutzen!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,7 +493,7 @@ msgstr ""
"Portweiterleitungen ermöglichen es entfernten Rechnern im Internet auf "
"bestimmte Computer oder Dienste im lokalen LAN zuzugreifen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -564,8 +501,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protokoll"
@@ -604,16 +539,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "NAT auf die angegebenen Ziel-Subnetze beschränken"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "NAT auf die angegebenen Quell-Subnetze beschränken"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Beschränke auf Adressfamilie"
@@ -661,8 +596,6 @@ msgstr "Quellport"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Quell-Zone"
@@ -694,8 +627,8 @@ msgstr ""
"Die Firewall erstellt Netzwerkzonen über bestimmte Netzwerkschnittstellen um "
"den Netzwerk-Traffic zu trennen."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -713,7 +646,7 @@ msgstr ""
"<em>nicht</em> zusätzlich die Erlaubnis, auch von WAN nach LAN "
"weiterzuleiten."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -757,14 +690,6 @@ msgstr "Zu %s auf <var>diesem Gerät</var>"
msgid "To %s, %s in %s"
msgstr "Zu %s, %s in %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Zu Quell-IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Zu Quell-Port"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -794,17 +719,17 @@ msgstr "Unbenannte Portweiterleitung"
msgid "Unnamed rule"
msgstr "Unbennante Regel"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -826,7 +751,7 @@ msgstr "Mittwoch"
msgid "Week Days"
msgstr "Wochentage"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Weiterleitungen"
@@ -838,7 +763,7 @@ msgstr "Zonen"
# ausgehenden Traffic annehmen.
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "zulassen"
@@ -887,7 +812,7 @@ msgstr "nicht verfolgen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "verwerfen"
@@ -920,7 +845,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "zurückweisen"
@@ -929,6 +854,12 @@ msgstr "zurückweisen"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -939,6 +870,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Hinzufügen"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hinzufügen und bearbeiten..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nicht umschreiben"
+
+#~ msgid "External zone"
+#~ msgstr "Externe Zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Neue SNAT-Regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Neue Weiterleitungsregel"
+
+#~ msgid "New input rule"
+#~ msgstr "Neue eingehende Regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Neue Portweiterleitung"
+
+#~ msgid "New source NAT"
+#~ msgstr "Neues SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports auf dem Router öffnen"
+
+#~ msgid "Other..."
+#~ msgstr "Anderes..."
+
+#~ msgid "To source IP"
+#~ msgstr "Zu Quell-IP"
+
+#~ msgid "To source port"
+#~ msgstr "Zu Quell-Port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Unbenannter Eintrag)"
diff --git a/applications/luci-app-firewall/po/el/firewall.po b/applications/luci-app-firewall/po/el/firewall.po
index 7e22a93958..04cb7c343e 100644
--- a/applications/luci-app-firewall/po/el/firewall.po
+++ b/applications/luci-app-firewall/po/el/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Ενέργεια"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Προσθήκη και επεξεργασία..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ρυθμίσεις για προχωρημένους"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -112,11 +100,11 @@ msgstr "Οποιοδήποτε"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "Θύρα προορισμού"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
#, fuzzy
msgid "Destination zone"
msgstr "Ζώνη προορισμού"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -231,7 +212,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "Προστασία SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -239,7 +220,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -248,21 +229,15 @@ msgid "External IP address"
msgstr "Εξωτερική διεύθυνση IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Εξωτερική θύρα"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Επιπλέον παράμετροι"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -270,7 +245,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr "Τείχος προστασίας - Κανόνες Κίνησεις"
msgid "Firewall - Zone Settings"
msgstr "Τείχος προστασίας - Ρυθμίσεις Ζώνης"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Επιβολή παρακολούθησης σύνδεσης"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Προώθηση"
@@ -371,12 +346,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 και IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Μόνο IPv4"
@@ -385,33 +360,30 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Μόνο IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Είσοδος"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
#, fuzzy
msgid "Internal IP address"
msgstr "Εσωτερική διεύθυνση"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
#, fuzzy
msgid "Internal port"
msgstr "Εξωτερική θύρα"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Εσωτερική ζώνη"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Περιορισμός καταγραφών συστήματος"
@@ -425,12 +397,12 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "Περιορισμός MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -460,11 +432,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Όνομα"
@@ -472,28 +440,6 @@ msgstr "Όνομα"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -512,17 +458,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Άλλο..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Έξοδος"
@@ -531,7 +468,7 @@ msgstr "Έξοδος"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Πρωτόκολλο"
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -655,8 +590,6 @@ msgstr "Θύρα πηγής"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
#, fuzzy
msgid "Source zone"
msgstr "Θύρα πηγής"
@@ -689,8 +622,8 @@ msgstr ""
"Το τείχος προστασίας δημιουργεί ζώνες πάνω στις διεπαφές δικτύου για να "
"ελέγχει την δικτυακή κίνηση."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -737,14 +670,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,7 +728,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -813,7 +738,7 @@ msgstr "Ζώνες"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "αποδοχή"
@@ -862,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "αγνόηση"
@@ -895,7 +820,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "απόρριψη"
@@ -904,6 +829,12 @@ msgstr "απόρριψη"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -914,5 +845,14 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Προσθήκη"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Προσθήκη και επεξεργασία..."
+
+#~ msgid "Other..."
+#~ msgstr "Άλλο..."
+
#~ msgid "Destination IP address"
#~ msgstr "Διεύθυνση IP προορισμού"
diff --git a/applications/luci-app-firewall/po/en/firewall.po b/applications/luci-app-firewall/po/en/firewall.po
index c089c8a27d..e38a33d2a6 100644
--- a/applications/luci-app-firewall/po/en/firewall.po
+++ b/applications/luci-app-firewall/po/en/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -110,11 +98,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -159,8 +147,6 @@ msgid "Destination port"
msgstr "Destination port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Destination zone"
@@ -183,17 +169,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -227,7 +208,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "Enable SYN-flood protection"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -235,7 +216,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -244,21 +225,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "External port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -266,7 +241,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Forward"
@@ -371,12 +346,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -385,31 +360,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Input"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Internal IP address"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Internal port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -423,11 +395,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquerading"
@@ -459,11 +431,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Name"
@@ -471,28 +439,6 @@ msgstr "Name"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -511,17 +457,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Output"
@@ -530,7 +467,7 @@ msgstr "Output"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -550,7 +487,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -558,8 +495,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocol"
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -683,8 +618,6 @@ msgstr "Source port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Source zone"
@@ -716,8 +649,8 @@ msgstr ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -727,7 +660,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -764,14 +697,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -798,17 +723,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -830,7 +755,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -840,7 +765,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accept"
@@ -889,7 +814,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -922,7 +847,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "reject"
@@ -931,6 +856,12 @@ msgstr "reject"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index 54bd644674..767da3f151 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2019-08-01 22:47-0300\n"
+"PO-Revision-Date: 2019-09-17 23:31-0300\n"
"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -61,19 +61,7 @@ msgstr "Aceptar salida"
msgid "Action"
msgstr "Acción"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Añadir"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Añadir y editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
"tráfico de destino de la zona, p.e. <code>-p tcp --dport 443</code> para que "
"solo coincida con el tráfico HTTPS saliente."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -98,15 +86,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Configuración avanzada"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Permitir tráfico \"inválido\""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permitir reenvío desde <em>zonas de origen</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir reenvío a <em>zonas de destino</em>:"
@@ -119,11 +107,11 @@ msgstr "Cualquiera"
msgid "Any day"
msgstr "Cualquier día"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Asignación automática de ayuda"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -134,19 +122,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr "Configuraciones de Conntrack"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Ayudantes de Conntrack"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Dispositivos cubiertos"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes cubiertas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Subredes cubiertas"
@@ -174,8 +162,6 @@ msgid "Destination port"
msgstr "Puerto de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zona de destino"
@@ -198,7 +184,7 @@ msgstr "Descartar entrada"
msgid "Discard output"
msgstr "Descartar salida"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
"estado conntrack <em>inválido</em>. Esto puede ser necesario para "
"configuraciones complejas de rutas asimétricas."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "No reescribir"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -245,7 +226,7 @@ msgstr "Habilitar bucle NAT"
msgid "Enable SYN-flood protection"
msgstr "Habilitar protección contra inundaciones SYN"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilitar registro en esta zona"
@@ -253,7 +234,7 @@ msgstr "Habilitar registro en esta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Característica experimental. No es totalmente compatible con QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
"Elige explícitamente los ayudantes de seguimiento de conexión permitidos "
@@ -264,21 +245,15 @@ msgid "External IP address"
msgstr "Dirección IP externa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Puerto externo"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Parámetros extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Argumentos de destino adicionales"
@@ -286,7 +261,7 @@ msgstr "Argumentos de destino adicionales"
msgid "Extra iptables arguments"
msgstr "Argumentos adicionales de iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Argumentos fuente adicionales"
@@ -310,12 +285,12 @@ msgstr "Firewall - Reglas de tráfico"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configuración de la zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forzar seguimiento de conexión"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Reenviar"
@@ -387,12 +362,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Sólo IPv4"
@@ -401,31 +376,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Sólo IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Dirección IP interna"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Puerto interno"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registro de mensajes"
@@ -439,11 +411,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Fijado de MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Enmascaramiento"
@@ -475,11 +447,7 @@ msgstr "Días del mes"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nombre"
@@ -487,28 +455,6 @@ msgstr "Nombre"
msgid "Network"
msgstr "Red"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nueva regla SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nueva regla de reenvío"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nueva regla de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuevo reenvío de puerto"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuevo origen NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Coincidir sólo con tráfico de entrada a esta dirección IP."
@@ -529,17 +475,8 @@ msgstr ""
"Solo coincida con el tráfico entrante que se origina desde el puerto de "
"origen o el rango de puertos en el host del cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir puertos en el router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Otros..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Salida"
@@ -548,7 +485,7 @@ msgstr "Salida"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Agrega más parámetros a iptables. ¡Utilice con cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -576,7 +513,7 @@ msgstr ""
"El reenvío de puertos permite a ordenadores remotos en internet conectar a "
"un ordenador o servicio específico en la LAN privada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -586,8 +523,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocolo"
@@ -627,16 +562,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Reiniciar Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringir enmascaramiento a las subredes destino"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringir enmascaramiento a las subredes origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringir a la familia de direcciones"
@@ -684,8 +619,6 @@ msgstr "Puerto de origen"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zona de origen"
@@ -717,8 +650,8 @@ msgstr ""
"El Firewall crea zonas sobre sus interfaces de red para controlar el flujo "
"del tráfico."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -735,7 +668,7 @@ msgstr ""
"la LAN a la WAN <em>no</em> implica permiso para reenviar desde la WAN a la "
"LAN también."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -778,14 +711,6 @@ msgstr "A %s por <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "A %s, %s en %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "A IP origen"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "A puerto origen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -815,11 +740,11 @@ msgstr "Reenvío sin nombre"
msgid "Unnamed rule"
msgstr "Regla sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Zona sin nombre"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -827,7 +752,7 @@ msgstr ""
"Use esta opción para clasificar el tráfico de zona por raw, dispositivos de "
"red no administrados <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -851,7 +776,7 @@ msgstr "Miércoles"
msgid "Week Days"
msgstr "Días de la semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Reenvíos"
@@ -861,7 +786,7 @@ msgstr "Zonas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "Aceptar"
@@ -910,7 +835,7 @@ msgstr "No seguir"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "Descartar"
@@ -943,7 +868,7 @@ msgstr "Puertos"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "Rechazar"
@@ -952,6 +877,12 @@ msgstr "Rechazar"
msgid "second"
msgstr "segundo"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr "Esta nueva zona"
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -962,6 +893,45 @@ msgstr "Tipo"
msgid "types"
msgstr "Tipos"
+#~ msgid "Add"
+#~ msgstr "Añadir"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Añadir y editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "No reescribir"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nueva regla SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nueva regla de reenvío"
+
+#~ msgid "New input rule"
+#~ msgstr "Nueva regla de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuevo reenvío de puerto"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuevo origen NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir puertos en el router"
+
+#~ msgid "Other..."
+#~ msgstr "Otros..."
+
+#~ msgid "To source IP"
+#~ msgstr "A IP origen"
+
+#~ msgid "To source port"
+#~ msgstr "A puerto origen"
+
#~ msgid "Output zone"
#~ msgstr "Zona de salida"
diff --git a/applications/luci-app-firewall/po/fr/firewall.po b/applications/luci-app-firewall/po/fr/firewall.po
index 64f7f3a383..7da22682bd 100644
--- a/applications/luci-app-firewall/po/fr/firewall.po
+++ b/applications/luci-app-firewall/po/fr/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Paramètres avancés"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permettre la transmission des <em>zones source</em> :"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permettre la transmission vers les <em>zones destination</em> :"
@@ -112,11 +100,11 @@ msgstr "N'importe lequel"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Réseaux couverts"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "Port de destination"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zone de destination"
@@ -185,17 +171,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -229,7 +210,7 @@ msgstr "Activer le NAT sur la boucle-locale"
msgid "Enable SYN-flood protection"
msgstr "Activer la protection contre le SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Activer les traces (logs) sur cette zone"
@@ -237,7 +218,7 @@ msgstr "Activer les traces (logs) sur cette zone"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -246,21 +227,15 @@ msgid "External IP address"
msgstr "Adresse IP externe"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Port externe"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zone externe"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -268,7 +243,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Pare-feu -- Règles de trafic"
msgid "Firewall - Zone Settings"
msgstr "Pare-feu - Configuration des zones"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forcer le suivi des connexions"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Transfert"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 et IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "IPv4 seulement"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "IPv6 seulement"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrée"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Adresse IP interne"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Port interne"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zone interne"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limiter les messages de journalisation"
@@ -425,11 +397,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Contrainte du MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquage"
@@ -461,11 +433,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nom"
@@ -473,28 +441,6 @@ msgstr "Nom"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nouvelle règle SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nouvelle règle d'entrée"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nouvelle redirection de port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nouvelle source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -513,17 +459,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Ports ouverts sur le routeur"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Autre..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Sortie"
@@ -532,7 +469,7 @@ msgstr "Sortie"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -554,7 +491,7 @@ msgstr ""
"La redirection de port permet aux ordinateurs distants sur Internet, de se "
"connecter à un ordinateur ou service spécifié dans le réseau local privé."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -562,8 +499,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocole"
@@ -601,20 +536,20 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
"destinataires"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
"Restreindre la substitution d'adresses (Masquerade) à ces sous-réseaux "
"sources"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restreindre à cette famille d'adresses"
@@ -692,8 +627,6 @@ msgstr "Port source"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zone source"
@@ -725,8 +658,8 @@ msgstr ""
"Le pare-feu crée des zones sur les interfaces réseau pour contrôler le flux "
"du trafic réseau."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -743,7 +676,7 @@ msgstr ""
"transmission du LAN au WAN n'implique <em>pas</em> également l'autorisation "
"de transmission du WAN au LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -787,14 +720,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -821,17 +746,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -853,7 +778,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zone ⇒ Transmissions"
@@ -863,7 +788,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accepter"
@@ -913,7 +838,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "ignorer"
@@ -946,7 +871,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeter"
@@ -955,6 +880,12 @@ msgstr "rejeter"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -965,6 +896,27 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "External zone"
+#~ msgstr "Zone externe"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nouvelle règle SNAT"
+
+#~ msgid "New input rule"
+#~ msgstr "Nouvelle règle d'entrée"
+
+#~ msgid "New port forward"
+#~ msgstr "Nouvelle redirection de port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nouvelle source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Ports ouverts sur le routeur"
+
+#~ msgid "Other..."
+#~ msgstr "Autre..."
+
#~ msgid "Destination IP address"
#~ msgstr "Adresse IP de destination"
diff --git a/applications/luci-app-firewall/po/he/firewall.po b/applications/luci-app-firewall/po/he/firewall.po
index 169711141b..b5e2e9a8d4 100644
--- a/applications/luci-app-firewall/po/he/firewall.po
+++ b/applications/luci-app-firewall/po/he/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -107,11 +95,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,8 +144,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -224,7 +205,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -232,7 +213,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -241,21 +222,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -263,7 +238,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -287,12 +262,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -364,12 +339,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -378,31 +353,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,11 +388,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -450,11 +422,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,28 +430,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -502,17 +448,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -521,7 +458,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,7 +478,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -549,8 +486,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -586,16 +521,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -643,8 +578,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -674,8 +607,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -722,14 +655,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -788,7 +713,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -798,7 +723,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -847,7 +772,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -880,7 +805,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/hu/firewall.po b/applications/luci-app-firewall/po/hu/firewall.po
index 202217a854..000c19f3d0 100644
--- a/applications/luci-app-firewall/po/hu/firewall.po
+++ b/applications/luci-app-firewall/po/hu/firewall.po
@@ -58,26 +58,14 @@ msgstr ""
msgid "Action"
msgstr "Művelet"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Hozzáadás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Hozzáadás és szerkesztés..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Haladó beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Továbbítás engedélyezése ezekből a <em>forrás zónákból</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Továbbítás engedélyezése ezekbe a <em>cél zónákba</em>:"
@@ -110,11 +98,11 @@ msgstr "Bármelyik"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Lefedett hálózatok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -163,8 +151,6 @@ msgid "Destination port"
msgstr "Cél port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Cél zóna"
@@ -187,17 +173,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ne írja felül"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -231,7 +212,7 @@ msgstr "NAT visszacsatolás engedélyezése"
msgid "Enable SYN-flood protection"
msgstr "SYN-flood védelem engedélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Naplózás engeélyezése ezen a zónán"
@@ -239,7 +220,7 @@ msgstr "Naplózás engeélyezése ezen a zónán"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -248,21 +229,15 @@ msgid "External IP address"
msgstr "Külső IP cím"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Külső port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Külső zóna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "További argumentumok"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -270,7 +245,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr "Tűzfal - Forgalmi szabályok"
msgid "Firewall - Zone Settings"
msgstr "Tűzfal - Zóna beállítások"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Kapcsolat követés kényszerítése"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Továbbítás"
@@ -371,12 +346,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 és IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "csak IPv4"
@@ -385,31 +360,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "csak IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Bemenet"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Belső IP cím"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Belső port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Belső zóna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Napló üzenetek korlátozása"
@@ -423,11 +395,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS clamping engegélyezése"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Álcázás"
@@ -459,11 +431,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Név"
@@ -471,28 +439,6 @@ msgstr "Név"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Új SNAT szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Új továbbítási szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Új bemeneti szabály"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Új port továbbítás"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Új forrás NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Csak a megadott IP címre irányított bejövő forgalmat egyeztesse."
@@ -515,17 +461,8 @@ msgstr ""
"Csak az ügyfél gép megadott forrás portjáról illetve forrás port "
"tartományába tartozó portról indított bejövő forgalmat egyeztesse."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Port megnyitása a routeren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Egyéb..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Kimenet"
@@ -535,7 +472,7 @@ msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"További argumentumok küldése az iptables részére. Használja körültekintően!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -558,7 +495,7 @@ msgstr ""
"privát helyi hálózat bizonyos számítógépéhez vagy szolgáltatásához történő "
"csatlakozását."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -566,8 +503,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protokoll"
@@ -603,16 +538,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Álcázás korlátozása a megadott cél alhálózatokra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Álcázás korlátozása a megadott forrás alhálózatokra"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Korlátozás cím családra"
@@ -660,8 +595,6 @@ msgstr "Forrás port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Forrás zóna"
@@ -693,8 +626,8 @@ msgstr ""
"A tűzfal zónákat határoz meg a hálózati interfészek fölött a hálózati "
"forgalom áramlásának szabályozására."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -711,7 +644,7 @@ msgstr ""
"LAN-ból WAN-ba <em>nem</em> jelenti azt, hogy a továbbítás WAN-ból LAN-ba is "
"engedélyezett."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -755,14 +688,6 @@ msgstr "%s-re a <var>eszközön</var>"
msgid "To %s, %s in %s"
msgstr "%s-re, %s %s-ben"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Forrás IP-re"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Forrás portra"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -792,17 +717,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -824,7 +749,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zóna ⇒ Továbbítások"
@@ -834,7 +759,7 @@ msgstr "Zónák"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "elfogadás"
@@ -883,7 +808,7 @@ msgstr "ne kövesse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "eldobás"
@@ -916,7 +841,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "visszautasítás"
@@ -925,6 +850,12 @@ msgstr "visszautasítás"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -935,6 +866,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Hozzáadás"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Hozzáadás és szerkesztés..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ne írja felül"
+
+#~ msgid "External zone"
+#~ msgstr "Külső zóna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Új SNAT szabály"
+
+#~ msgid "New forward rule"
+#~ msgstr "Új továbbítási szabály"
+
+#~ msgid "New input rule"
+#~ msgstr "Új bemeneti szabály"
+
+#~ msgid "New port forward"
+#~ msgstr "Új port továbbítás"
+
+#~ msgid "New source NAT"
+#~ msgstr "Új forrás NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Port megnyitása a routeren"
+
+#~ msgid "Other..."
+#~ msgstr "Egyéb..."
+
+#~ msgid "To source IP"
+#~ msgstr "Forrás IP-re"
+
+#~ msgid "To source port"
+#~ msgstr "Forrás portra"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Névtelen bejegyzés)"
diff --git a/applications/luci-app-firewall/po/it/firewall.po b/applications/luci-app-firewall/po/it/firewall.po
index 107a4d3a1c..aa522e2f24 100644
--- a/applications/luci-app-firewall/po/it/firewall.po
+++ b/applications/luci-app-firewall/po/it/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Azione"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Aggiungi"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Aggiungi e modifica..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Opzioni Avanzate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permetti routing da <em>zone di origine</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permetti rounting a <em>zone di destinazione</em>:"
@@ -112,11 +100,11 @@ msgstr "Qualsiasi"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Reti coperte"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -165,8 +153,6 @@ msgid "Destination port"
msgstr "Porta di destinazione"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zona di destinazione"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Non riscrivere"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -233,7 +214,7 @@ msgstr "Attiva NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Attiva protezione SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Attiva registro su questa zona"
@@ -241,7 +222,7 @@ msgstr "Attiva registro su questa zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Indirizzo IP Esterno"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Porta Esterna"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona Esterna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Comandi extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Regole Traffico"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Opzioni delle Zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forza tracciamento connessione"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Inoltra"
@@ -373,12 +348,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Solo IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Solo IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Ingresso"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Indirizzo IP interno"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Porta interna"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita messaggi del registro"
@@ -425,11 +397,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -461,11 +433,7 @@ msgstr "Giorni del Mese"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -473,28 +441,6 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nuova regola SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nuova regola di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nuova regola di ingresso"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nuova porta di inoltro"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nuova sorgente NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Corrispondi solo traffico in entrata diretto al dato indirizzo IP."
@@ -515,17 +461,8 @@ msgstr ""
"Corrispondi solo traffico in entrata originato dalla porta o intervallo di "
"porte sorgenti su host cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Porte aperte sul router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altri..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -534,7 +471,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa comandi addizionali a iptables. Usare con cura!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,7 +493,7 @@ msgstr ""
"L'inoltro delle porte permette ai computer in remoto su Internet di "
"connettersi a uno specifico computer o servizio presente nella LAN privata"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -564,8 +501,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocollo"
@@ -601,16 +536,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Riavvia Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Limita il Masquerading alle subnet di destinazione date"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Limita il Masquerading alle subnet sorgente date"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Limita agli indirizzi famiglia"
@@ -679,8 +614,6 @@ msgstr "Porta di origine"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zona di origine"
@@ -712,8 +645,8 @@ msgstr ""
"Il firewall crea delle zone nelle tue interfacce di rete per controllare il "
"flusso del traffico."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +663,7 @@ msgstr ""
"alla wan <em>non</em> implica anche un permesso da inoltrare dalla wan alla "
"lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -773,14 +706,6 @@ msgstr "Verso %s su <var>questo dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Verso %s, %s in %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Verso IP sorgente"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Verso la porta sorgente"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -810,17 +735,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -842,7 +767,7 @@ msgstr "Mercoledì"
msgid "Week Days"
msgstr "Giorni della Settimana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Inoltri"
@@ -852,7 +777,7 @@ msgstr "Zone"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accetta"
@@ -901,7 +826,7 @@ msgstr "non tracciare"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "scarta"
@@ -934,7 +859,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rifiuta"
@@ -943,6 +868,12 @@ msgstr "rifiuta"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -953,6 +884,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Aggiungi"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Aggiungi e modifica..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Non riscrivere"
+
+#~ msgid "External zone"
+#~ msgstr "Zona Esterna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nuova regola SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nuova regola di inoltro"
+
+#~ msgid "New input rule"
+#~ msgstr "Nuova regola di ingresso"
+
+#~ msgid "New port forward"
+#~ msgstr "Nuova porta di inoltro"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nuova sorgente NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Porte aperte sul router"
+
+#~ msgid "Other..."
+#~ msgstr "Altri..."
+
+#~ msgid "To source IP"
+#~ msgstr "Verso IP sorgente"
+
+#~ msgid "To source port"
+#~ msgstr "Verso la porta sorgente"
+
#~ msgid "Destination IP address"
#~ msgstr "Indirizzo IP destinazione"
diff --git a/applications/luci-app-firewall/po/ja/firewall.po b/applications/luci-app-firewall/po/ja/firewall.po
index 8a1b4f2506..85702e60de 100644
--- a/applications/luci-app-firewall/po/ja/firewall.po
+++ b/applications/luci-app-firewall/po/ja/firewall.po
@@ -61,19 +61,7 @@ msgstr "出力を許可"
msgid "Action"
msgstr "動作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "追加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "追加及び編集..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -83,7 +71,7 @@ msgstr ""
"em> 引数です。(例: HTTPS 送信トラフィックのみにマッチさせる <code>-p tcp --"
"dport 443</code>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -98,15 +86,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "詳細設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "\"invalid\" トラフィックの許可"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>送信元ゾーン</em>からの転送を許可する:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>宛先ゾーン</em>への転送を許可する:"
@@ -119,11 +107,11 @@ msgstr "全て"
msgid "Any day"
msgstr "全日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "自動ヘルパー割り当て"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -134,19 +122,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr "Conntrack 設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Conntrack ヘルパー"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "カバーされるデバイス"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "対象ネットワーク"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "カバーされるサブネット"
@@ -174,8 +162,6 @@ msgid "Destination port"
msgstr "宛先ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "宛先ゾーン"
@@ -198,7 +184,7 @@ msgstr "入力を破棄"
msgid "Discard output"
msgstr "出力を破棄"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -207,11 +193,6 @@ msgstr ""
"追加ルールをインストールしません。これは、複雑で非対称なルートのセットアップ"
"に必要となることがあります。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "リライトしない"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -245,7 +226,7 @@ msgstr "NATループバックを有効にする"
msgid "Enable SYN-flood protection"
msgstr "SYN-Floodプロテクションを有効にする"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "このゾーンのログ記録を有効にする"
@@ -253,7 +234,7 @@ msgstr "このゾーンのログ記録を有効にする"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "実験的な機能です。 QoS/SQM との完全な互換性はありません。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr "ゾーン トラフィックのコネクション追跡ヘルパーを明示的に選択します。"
@@ -262,21 +243,15 @@ msgid "External IP address"
msgstr "外部IPアドレス"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "外部ポート"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部ゾーン"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "追加の引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "追加の送信先引数"
@@ -284,7 +259,7 @@ msgstr "追加の送信先引数"
msgid "Extra iptables arguments"
msgstr "追加の iptables 引数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "追加の送信元引数"
@@ -308,12 +283,12 @@ msgstr "ファイアウォール - トラフィック・ルール"
msgid "Firewall - Zone Settings"
msgstr "ファイアウォール - ゾーン設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "強制的にコネクション追跡を行う"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "転送"
@@ -385,12 +360,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4及びIPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "IPv4のみ"
@@ -399,31 +374,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "IPv6のみ"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "受信"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "内部IPアドレス"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "内部ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "内部ゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "ログメッセージを制限"
@@ -437,11 +409,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSSクランプ"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "マスカレード"
@@ -473,11 +445,7 @@ msgstr "月間"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名前"
@@ -485,28 +453,6 @@ msgstr "名前"
msgid "Network"
msgstr "ネットワーク"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "SNATルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "転送ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "受信ルールの新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "転送設定の新規作成"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "SNATルールの新規作成"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "設定された宛先IPアドレスと一致した受信トラフィックが対象になります。"
@@ -529,17 +475,8 @@ msgstr ""
"設定されたクライアントホストの送信元ポート(またはポート範囲)からの受信トラ"
"フィックと一致したトラフィックのみを対象にします。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "ポートの開放"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "その他のプロトコル"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "送信"
@@ -550,7 +487,7 @@ msgstr ""
"iptablesにパススルーする追加の引数を設定してください。ただし、注意して設定し"
"てください!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -578,7 +515,7 @@ msgstr ""
"ベートなネットワーク上の、特定のコンピュータやサービスへのアクセスを可能にし"
"ます。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -588,8 +525,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "プロトコル"
@@ -627,16 +562,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "ファイアウォールの再起動"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "設定された宛先サブネットへのマスカレードを制限する"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "設定された送信元サブネットへのマスカレードを制限する"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "アドレスファミリの制限"
@@ -684,8 +619,6 @@ msgstr "送信元ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "送信元ゾーン"
@@ -717,8 +650,8 @@ msgstr ""
"ファイアウォール機能は、各ネットワークインターフェース上にゾーンを作成してト"
"ラフィックの制御を行います。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -734,7 +667,7 @@ msgstr ""
"向</em>であり、例えばlanからwanへの転送設定は、wanからlanへの転送を<em>許可し"
"ません。</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -776,14 +709,6 @@ msgstr "宛先 %s (<var>デバイス</var>)"
msgid "To %s, %s in %s"
msgstr "宛先 %s, %s (%s)"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "変換後送信元IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "変換後送信元ポート"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -813,11 +738,11 @@ msgstr "名称未設定の転送"
msgid "Unnamed rule"
msgstr "名称未設定のルール"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "名称未設定のゾーン"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -825,7 +750,7 @@ msgstr ""
"生の、または非 <em>uci</em> 管理下にあるデバイスによるゾーン トラフィックの区"
"分にこのオプションを使用します。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -849,7 +774,7 @@ msgstr "水曜日"
msgid "Week Days"
msgstr "曜日"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "ゾーン ⇒ 転送"
@@ -859,7 +784,7 @@ msgstr "ゾーン"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "許可"
@@ -908,7 +833,7 @@ msgstr "コネクション追跡を行わない"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "破棄"
@@ -941,7 +866,7 @@ msgstr "ポート"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒否"
@@ -950,6 +875,12 @@ msgstr "拒否"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -959,3 +890,42 @@ msgstr "タイプ"
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:130
msgid "types"
msgstr "タイプ"
+
+#~ msgid "Add"
+#~ msgstr "追加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "追加及び編集..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "リライトしない"
+
+#~ msgid "External zone"
+#~ msgstr "外部ゾーン"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "New forward rule"
+#~ msgstr "転送ルールの新規作成"
+
+#~ msgid "New input rule"
+#~ msgstr "受信ルールの新規作成"
+
+#~ msgid "New port forward"
+#~ msgstr "転送設定の新規作成"
+
+#~ msgid "New source NAT"
+#~ msgstr "SNATルールの新規作成"
+
+#~ msgid "Open ports on router"
+#~ msgstr "ポートの開放"
+
+#~ msgid "Other..."
+#~ msgstr "その他のプロトコル"
+
+#~ msgid "To source IP"
+#~ msgstr "変換後送信元IP"
+
+#~ msgid "To source port"
+#~ msgstr "変換後送信元ポート"
diff --git a/applications/luci-app-firewall/po/ko/firewall.po b/applications/luci-app-firewall/po/ko/firewall.po
index a7dd7801a4..c916d1122f 100644
--- a/applications/luci-app-firewall/po/ko/firewall.po
+++ b/applications/luci-app-firewall/po/ko/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "추가 후 수정..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "<em>Source zone</em> 로부터의 forward 허용:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "<em>Destination zone</em> 으로 forward 허용:"
@@ -112,11 +100,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -164,8 +152,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr ""
@@ -188,17 +174,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -232,7 +213,7 @@ msgstr "NAT Loopback 활성화"
msgid "Enable SYN-flood protection"
msgstr "SYN-flood protection 활성화"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "zone 의 logging 활성화"
@@ -240,7 +221,7 @@ msgstr "zone 의 logging 활성화"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -249,21 +230,15 @@ msgid "External IP address"
msgstr "외부 IP 주소"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "외부 port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "외부 zone"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "추가 argument"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -271,7 +246,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -295,12 +270,12 @@ msgstr "방화벽 - Traffic Rules"
msgid "Firewall - Zone Settings"
msgstr "방화벽 - Zone 설정"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -372,12 +347,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -386,31 +361,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "내부 IP 주소"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "내부 port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "내부 zone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -424,11 +396,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -458,11 +430,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "이름"
@@ -470,28 +438,6 @@ msgstr "이름"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "새로운 SNAT rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "새로운 forward rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "새로운 input rule"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "새로운 port forward"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "새로운 source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -510,17 +456,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -529,7 +466,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "iptables 명령에 추가 인자들을 더합니다. 조심해 사용하세요!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgstr ""
"Port forwarding 기능은 인터넷 상의 원격 컴퓨터가 내부 LAN 에 속한 특정 컴퓨터"
"나 서비스에 접속할 수 있도록 합니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "주어진 destination subnet 으로 Masquerading 제한"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "주어진 source subnet 으로 Masquerading 제한"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Address family 제한"
@@ -653,8 +588,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -686,8 +619,8 @@ msgstr ""
"방화벽 기능을 이용하여 네트워크 인터페이스와 연결된 zone 을 생성할 수 있고 이"
"를 이용하여 네트워크 traffic flow 를 제어할 수 있습니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -703,7 +636,7 @@ msgstr ""
"<em>unidirectional</em> 인데, 예를 들어 LAN 에서 WAN 으로의 forward 규칙이 "
"WAN 에서 LAN 으로의 forward 를 허락하는 것이 아닙니다."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -746,14 +679,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -783,17 +708,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -815,7 +740,7 @@ msgstr "수요일"
msgid "Week Days"
msgstr "주일"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -825,7 +750,7 @@ msgstr "Zone 내역"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -874,7 +799,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -907,7 +832,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -916,6 +841,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -926,6 +857,27 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add and edit..."
+#~ msgstr "추가 후 수정..."
+
+#~ msgid "External zone"
+#~ msgstr "외부 zone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "새로운 SNAT rule"
+
+#~ msgid "New forward rule"
+#~ msgstr "새로운 forward rule"
+
+#~ msgid "New input rule"
+#~ msgstr "새로운 input rule"
+
+#~ msgid "New port forward"
+#~ msgstr "새로운 port forward"
+
+#~ msgid "New source NAT"
+#~ msgstr "새로운 source NAT"
+
#~ msgid "Destination IP address"
#~ msgstr "Destination IP 주소"
diff --git a/applications/luci-app-firewall/po/ms/firewall.po b/applications/luci-app-firewall/po/ms/firewall.po
index 7a93f6b661..56a0f053ef 100644
--- a/applications/luci-app-firewall/po/ms/firewall.po
+++ b/applications/luci-app-firewall/po/ms/firewall.po
@@ -54,26 +54,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -85,15 +73,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -106,11 +94,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -119,19 +107,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -155,8 +143,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr ""
@@ -179,17 +165,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -223,7 +204,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -231,7 +212,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -240,21 +221,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -262,7 +237,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -286,12 +261,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -363,12 +338,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -377,31 +352,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -415,11 +387,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -449,11 +421,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -461,28 +429,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -501,17 +447,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -520,7 +457,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -540,7 +477,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -548,8 +485,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -585,16 +520,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -642,8 +577,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -673,8 +606,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -684,7 +617,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -721,14 +654,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -755,17 +680,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -787,7 +712,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -797,7 +722,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -846,7 +771,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -879,7 +804,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -888,6 +813,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/no/firewall.po b/applications/luci-app-firewall/po/no/firewall.po
index b9c3b1a809..625a6a363b 100644
--- a/applications/luci-app-firewall/po/no/firewall.po
+++ b/applications/luci-app-firewall/po/no/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr "Handling"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Legg til"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Legg til og redigere..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Avanserte Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Tillat videresending fra <em>kilde soner</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Tillat videresending til <em>destinasjon soner</em>:"
@@ -107,11 +95,11 @@ msgstr "Enhver"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Gjeldene nettverk"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -159,8 +147,6 @@ msgid "Destination port"
msgstr "Destinasjon port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Destinasjon sone"
@@ -183,17 +169,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Ikke omskriv"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -227,7 +208,7 @@ msgstr "Aktiver NAT <abbr title=\"Loopback\">Tilbakekobling</abbr>"
msgid "Enable SYN-flood protection"
msgstr "Aktiver SYN-flood beskyttelse"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Aktiver logging av denne sonen"
@@ -235,7 +216,7 @@ msgstr "Aktiver logging av denne sonen"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -244,21 +225,15 @@ msgid "External IP address"
msgstr "Ekstern IP adressse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Ekstern port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Ekstern sone"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Ekstra argumenter"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -266,7 +241,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -290,13 +265,13 @@ msgstr "Brannmur - Trafikk Regler"
msgid "Firewall - Zone Settings"
msgstr "Brannmur - Sone Innstillinger"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
"Bruk <abbr title=\\\"connection tracking\\\">forbindelse sporing</abbr>"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Videresend"
@@ -368,12 +343,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 og IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Kun IPv4"
@@ -382,31 +357,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Kun IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Inndata"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Intern IP adresse"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Intern port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Intern sone"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begrens logging"
@@ -420,11 +392,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS Kontroll (Clamping)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Masquerading"
@@ -456,11 +428,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Navn"
@@ -468,28 +436,6 @@ msgstr "Navn"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny videresending regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inndata regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny port videresending"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny kilde NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Match kun innkommende trafikk rettet mot den oppgitt IP adresse."
@@ -510,17 +456,8 @@ msgstr ""
"Match kun innkommende trafikk som kommer fra den oppgitte kildeport eller "
"fra portområdet til klienten"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Åpne porter på ruteren"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andre..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Utdata"
@@ -529,7 +466,7 @@ msgstr "Utdata"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Sender flere argumenter til iptables. Bruk med forsiktighet!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgstr ""
"Port videresending tillater at eksterne datamaskiner på Internett kan koble "
"seg til en bestemt maskin eller tjeneste innenfor det private LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protokoll"
@@ -598,16 +533,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Begrens Masquerading til oppgitt destinasjons subnett"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Begrens Masqeuerading til oppgitt kilde subnett"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Begrens til adresse familie"
@@ -655,8 +590,6 @@ msgstr "Kilde port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Kilde sone"
@@ -688,8 +621,8 @@ msgstr ""
"Brannmuren skaper soner over nettverkets grensesnitt for å styre "
"nettverkstrafikken."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgstr ""
"ved videresending er <em>enveis</em>, d.v.s at videresending fra LAN til WAN "
"<em>ikke</em> automatisk også tillater videresending fra WAN til LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -749,14 +682,6 @@ msgstr "Til %s på <var>denne enheten</var>"
msgid "To %s, %s in %s"
msgstr "Til %s, %s i %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Til kilde IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Til kilde port"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -786,17 +711,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -818,7 +743,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Sone = Videresendinger"
@@ -828,7 +753,7 @@ msgstr "Soner"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "godta"
@@ -877,7 +802,7 @@ msgstr "ikke track"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "forkast"
@@ -910,7 +835,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "avslå"
@@ -919,6 +844,12 @@ msgstr "avslå"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -929,6 +860,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Legg til"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Legg til og redigere..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Ikke omskriv"
+
+#~ msgid "External zone"
+#~ msgstr "Ekstern sone"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny videresending regel"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inndata regel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny port videresending"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny kilde NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Åpne porter på ruteren"
+
+#~ msgid "Other..."
+#~ msgstr "Andre..."
+
+#~ msgid "To source IP"
+#~ msgstr "Til kilde IP"
+
+#~ msgid "To source port"
+#~ msgstr "Til kilde port"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(oppføring uten navn)"
diff --git a/applications/luci-app-firewall/po/pl/firewall.po b/applications/luci-app-firewall/po/pl/firewall.po
index 242adf48e0..5c96d57b79 100644
--- a/applications/luci-app-firewall/po/pl/firewall.po
+++ b/applications/luci-app-firewall/po/pl/firewall.po
@@ -62,26 +62,14 @@ msgstr ""
msgid "Action"
msgstr "Działanie"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Dodaj"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Dodaj i edytuj..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -93,15 +81,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Zezwól na przekazywanie z <em>source zones</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Zezwól na przekazywanie do <em>destination zones</em>:"
@@ -114,11 +102,11 @@ msgstr "Każdy"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -127,19 +115,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Objęte sieci"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -166,8 +154,6 @@ msgid "Destination port"
msgstr "Port docelowy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Strefa docelowa"
@@ -190,17 +176,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nie przepisuj"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -234,7 +215,7 @@ msgstr "Włącz NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Włącz ochronę przed atakiem SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Włącz logowanie na tej strefy"
@@ -242,7 +223,7 @@ msgstr "Włącz logowanie na tej strefy"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -251,21 +232,15 @@ msgid "External IP address"
msgstr "Zewnętrzne adresy IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Port zewnętrzny"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Strefa zewnętrzna"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Dodatkowe argumenty"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -273,7 +248,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -300,12 +275,12 @@ msgstr "Zapora - Reguły ruchu"
msgid "Firewall - Zone Settings"
msgstr "Zapora - Ustawienia strefy"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Wymuś śledzenie połączeń"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Przekazuj"
@@ -377,12 +352,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 i IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Tylko IPv4"
@@ -391,31 +366,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Tylko IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Ruch przychodzący"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Wewnętrzny adres IP"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Wewnętrzny port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Strefa wewnętrzna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ograniczenie logowania"
@@ -429,11 +401,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Dostosuj MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maskarada"
@@ -465,11 +437,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nazwa"
@@ -477,28 +445,6 @@ msgstr "Nazwa"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nowa reguła SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nowa reguła przekazywania (forward)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nowa reguła wejściowa (input)"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Nowe przekierowanie portu"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nowy NAT źródłowy"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Dopasuj tylko przychodzący ruch skierowany do danego adresu IP."
@@ -519,17 +465,8 @@ msgstr ""
"Dopasuj tylko ruch przychodzący z podanego portu źródłowego lub zakresu "
"portów na hoście klienta"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Otwarte porty na routerze"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Inne..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Wyjście (Output)"
@@ -539,7 +476,7 @@ msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Przekazuje dodatkowe argumenty do iptables. Zachowaj szczególną ostrożność!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -561,7 +498,7 @@ msgstr ""
"Przekierowanie portów pozwala komputerom z internetu na połączenia z "
"komputerami z sieci LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -569,8 +506,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protokół"
@@ -608,18 +543,18 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Ogranicz maskaradę do wskazanych sieci docelowych"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Ogranicz maskaradę do wskazanych sieci źródłowych"
# Wstawiłem rodzinę gdyż gdzieś wcześniej było tak opisane ale klasa pasuje mi tu bardziej.
# Obsy - niestety ale "rodzina". W gui dotyczy to wyboru IPv4/IPv6, więc "rodzina" a nie klasa.
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Ogranicz do rodziny adresów"
@@ -667,8 +602,6 @@ msgstr "Port źródłowy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Strefa źródłowa"
@@ -700,8 +633,8 @@ msgstr ""
"Firewall tworzy strefy z Twoich interfejsów sieciowych, aby kontrolować ruch "
"sieciowy."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -717,7 +650,7 @@ msgstr ""
"przekazywania jest <em>jednokierunkowa</em>, np. przekazywanie z sieci LAN "
"do WAN <em>nie</em> implikuje pozwolenia na przekazywanie z sieci WAN do LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
#, fuzzy
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -760,14 +693,6 @@ msgstr "Do %s na <var>tym urządzeniu</var>"
msgid "To %s, %s in %s"
msgstr "Do %s, %s w %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Do źródłowego IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Do źródłowego portu"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -797,17 +722,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -829,7 +754,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Strefa ⇒ Przekazywanie"
@@ -839,7 +764,7 @@ msgstr "Strefy"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "akceptuj"
@@ -888,7 +813,7 @@ msgstr "nie śledź"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "porzucaj"
@@ -921,7 +846,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "odrzucaj"
@@ -930,6 +855,12 @@ msgstr "odrzucaj"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -940,6 +871,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Dodaj"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Dodaj i edytuj..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nie przepisuj"
+
+#~ msgid "External zone"
+#~ msgstr "Strefa zewnętrzna"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nowa reguła SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nowa reguła przekazywania (forward)"
+
+#~ msgid "New input rule"
+#~ msgstr "Nowa reguła wejściowa (input)"
+
+#~ msgid "New port forward"
+#~ msgstr "Nowe przekierowanie portu"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nowy NAT źródłowy"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Otwarte porty na routerze"
+
+#~ msgid "Other..."
+#~ msgstr "Inne..."
+
+#~ msgid "To source IP"
+#~ msgstr "Do źródłowego IP"
+
+#~ msgid "To source port"
+#~ msgstr "Do źródłowego portu"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Nienazwany wpis)"
diff --git a/applications/luci-app-firewall/po/pt-br/firewall.po b/applications/luci-app-firewall/po/pt-br/firewall.po
index 608dfbc520..6926402548 100644
--- a/applications/luci-app-firewall/po/pt-br/firewall.po
+++ b/applications/luci-app-firewall/po/pt-br/firewall.po
@@ -60,26 +60,14 @@ msgstr "Aceitar a saída"
msgid "Action"
msgstr "Ação"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Configurações Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permite o encaminhamento da <em>zona de origem</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite o encaminhamento para a <em>zona de destino</em>:"
@@ -112,11 +100,11 @@ msgstr "Qualquer"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes cobertas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -164,8 +152,6 @@ msgid "Destination port"
msgstr "Porta de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zona de destino"
@@ -188,17 +174,12 @@ msgstr "Descartar a entrada"
msgid "Discard output"
msgstr "Descartar a saída"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não sobrescreva"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -232,7 +213,7 @@ msgstr "Habilite o Loopback do NAT"
msgid "Enable SYN-flood protection"
msgstr "Habilite proteção contra SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Habilite o registro nesta zona"
@@ -241,7 +222,7 @@ msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
"Funcionalidade experimental. Ela não é totalmente compatível com QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Endereço IP externo"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Porta Externa"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Argumentos extras"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Regras de Tráfego"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Configurações de Zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Force o rastreamento da conexão"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Encaminhar"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Somente IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Somente IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Endereço IP interno"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Porta Interna"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limita as mensagens de registro"
@@ -425,11 +397,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MACs"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ajuste do MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Mascaramento"
@@ -461,11 +433,7 @@ msgstr "Dias do mês"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -473,28 +441,6 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra de SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -516,17 +462,8 @@ msgstr ""
"Somente case o tráfego entrante vindo da porta de origem fornecida ou "
"intervalo de portas no equipamento cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no roteador"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Saída"
@@ -535,7 +472,7 @@ msgstr "Saída"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Use com cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -557,7 +494,7 @@ msgstr ""
"O encaminhamento de portas permite que computadores remotos na Internet "
"conectem a um computador ou serviço específico dentro da rede local privada."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -565,8 +502,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocolo"
@@ -603,16 +538,16 @@ msgstr "Requer suporte de NAT em hardware. Implementado ao menos para mt7621"
msgid "Restart Firewall"
msgstr "Reiniciar o Firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Restringe o mascaramento para uma subrede de destino específica"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Restringe o mascaramento para uma subrede de origem específica"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringe para uma família de endereços"
@@ -660,8 +595,6 @@ msgstr "Porta de origem"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zona de origem"
@@ -693,8 +626,8 @@ msgstr ""
"O firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
"tráfego de rede."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -710,7 +643,7 @@ msgstr ""
"encaminhamento é <em>unidirecional</em>, ex: um encaminhamento da LAN para "
"WAN <em>não</em> implica na permissão de encaminhar da WAN para LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -753,14 +686,6 @@ msgstr "Para %s <var>neste dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o endereço IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -790,17 +715,17 @@ msgstr "Encaminhamento sem nome"
msgid "Unnamed rule"
msgstr "Regra sem nome"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -822,7 +747,7 @@ msgstr "Quarta-feira"
msgid "Week Days"
msgstr "Dias da semana"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
@@ -832,7 +757,7 @@ msgstr "Zonas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "aceitar"
@@ -881,7 +806,7 @@ msgstr "não rastrear"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "descartar"
@@ -914,7 +839,7 @@ msgstr "portas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeitar"
@@ -923,6 +848,12 @@ msgstr "rejeitar"
msgid "second"
msgstr "segundo"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -933,6 +864,45 @@ msgstr "tipo"
msgid "types"
msgstr "tipos"
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não sobrescreva"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra de SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no roteador"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o endereço IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
#~ msgid "Output zone"
#~ msgstr "Zona de saída"
diff --git a/applications/luci-app-firewall/po/pt/firewall.po b/applications/luci-app-firewall/po/pt/firewall.po
index 349f4c369f..281c6b17b3 100644
--- a/applications/luci-app-firewall/po/pt/firewall.po
+++ b/applications/luci-app-firewall/po/pt/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Acção"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adicionar"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adicionar e editar..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Definições Avançadas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permitir encaminhamento de <em>zonas de origem</em>"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permitir encaminhamento para <em>zonas de destino</em>"
@@ -112,11 +100,11 @@ msgstr "Qualquer"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Redes abrangidas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -165,8 +153,6 @@ msgid "Destination port"
msgstr "Porta de destino"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zona de destino"
@@ -189,17 +175,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Não re-escrever"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -233,7 +214,7 @@ msgstr "Ativar NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Ativar a Proteção SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Ativar registo nesta zona"
@@ -241,7 +222,7 @@ msgstr "Ativar registo nesta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -250,21 +231,15 @@ msgid "External IP address"
msgstr "Endereço IP externo"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Porta externa"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zona externa"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Argumentos extra"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -272,7 +247,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -296,12 +271,12 @@ msgstr "Firewall - Regras de Tráfego"
msgid "Firewall - Zone Settings"
msgstr "Firewall - Definições de Zona"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forçar rasto de ligação"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Encaminhar"
@@ -373,12 +348,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 e IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Só IPv4"
@@ -387,31 +362,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Só IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Entrada"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Endereço IP interno"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Porta interna"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zona Interna"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitar registo de mensagens"
@@ -425,12 +397,12 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "MSS-Correction"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -462,11 +434,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nome"
@@ -474,28 +442,6 @@ msgstr "Nome"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Nova regra SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Nova regra de encaminhamento"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Nova regra de entrada"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Novo encaminhamento de porta"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Nova origem de NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Só se tráfego de entrada corresponder ao endereço IP fornecido."
@@ -516,17 +462,8 @@ msgstr ""
"Só se o tráfego de entrada corresponder à porta de origem fornecida ou de um "
"intervalo de portas no host cliente"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Abrir portas no router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Outro..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Saída"
@@ -535,7 +472,7 @@ msgstr "Saída"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "Passa argumentos adicionais para o iptables. Usar com cuidado!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -557,7 +494,7 @@ msgstr ""
"O Encaminhamento de Portas permite que computadores remotos na internet se "
"liguem a um computador ou serviço especifico na rede privada (LAN)."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -565,8 +502,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocolo"
@@ -604,16 +539,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Restringir a família de endereços"
@@ -661,8 +596,6 @@ msgstr "Porta de origem"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zona de origem"
@@ -694,8 +627,8 @@ msgstr ""
"A firewall cria zonas sobre as interfaces de rede para controlar o fluxo do "
"tráfego."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -705,7 +638,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -742,14 +675,6 @@ msgstr "Para %s em <var>este dispositivo</var>"
msgid "To %s, %s in %s"
msgstr "Para %s, %s em %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "Para o IP de origem"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "Para a porta de origem"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -779,17 +704,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -811,7 +736,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Zona ⇒ Encaminhamentos"
@@ -821,7 +746,7 @@ msgstr "Zonas"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "aceitar"
@@ -870,7 +795,7 @@ msgstr "não seguir"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -903,7 +828,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "rejeitar"
@@ -912,6 +837,12 @@ msgstr "rejeitar"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -922,6 +853,45 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Adicionar"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adicionar e editar..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Não re-escrever"
+
+#~ msgid "External zone"
+#~ msgstr "Zona externa"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Nova regra SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Nova regra de encaminhamento"
+
+#~ msgid "New input rule"
+#~ msgstr "Nova regra de entrada"
+
+#~ msgid "New port forward"
+#~ msgstr "Novo encaminhamento de porta"
+
+#~ msgid "New source NAT"
+#~ msgstr "Nova origem de NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Abrir portas no router"
+
+#~ msgid "Other..."
+#~ msgstr "Outro..."
+
+#~ msgid "To source IP"
+#~ msgstr "Para o IP de origem"
+
+#~ msgid "To source port"
+#~ msgstr "Para a porta de origem"
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Entrada Sem Nome)"
diff --git a/applications/luci-app-firewall/po/ro/firewall.po b/applications/luci-app-firewall/po/ro/firewall.po
index 472948d4b7..30d3d89e5d 100644
--- a/applications/luci-app-firewall/po/ro/firewall.po
+++ b/applications/luci-app-firewall/po/ro/firewall.po
@@ -59,26 +59,14 @@ msgstr ""
msgid "Action"
msgstr "Acţiune"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Adaugă"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Adaugă şi editează..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -90,15 +78,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Setări avansate"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Permite trecerea din <em>zonele sursa</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Permite trecerea catre <em>zonele sursa</em>."
@@ -111,11 +99,11 @@ msgstr "Oricare"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -124,19 +112,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Retele acoperite"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -160,8 +148,6 @@ msgid "Destination port"
msgstr "Portul destinatie"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Zona destinatie"
@@ -184,17 +170,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Nu rescrie"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -228,7 +209,7 @@ msgstr "Activează loopback NAT"
msgid "Enable SYN-flood protection"
msgstr "Activează protecţia SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Activeaza log in aceasta zona"
@@ -236,7 +217,7 @@ msgstr "Activeaza log in aceasta zona"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -245,21 +226,15 @@ msgid "External IP address"
msgstr "Adresă IP externă"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Port extern"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Zonă externă"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -267,7 +242,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -291,12 +266,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr "Setari zona la firewall"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Forteaza urmarirea conexiunilor"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Forward"
@@ -368,12 +343,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 şi IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "doar IPv4"
@@ -382,31 +357,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "doar IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Intrare"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Adresa IP interna"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Port intern"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Zonă internă"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Limitează mesaje în log"
@@ -420,11 +392,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ajustare MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Translatare"
@@ -454,11 +426,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Nume"
@@ -466,28 +434,6 @@ msgstr "Nume"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Regulă nouă SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -506,17 +452,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Altele..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Ieşire"
@@ -525,7 +462,7 @@ msgstr "Ieşire"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -545,7 +482,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -553,8 +490,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protocol"
@@ -590,16 +525,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -647,8 +582,6 @@ msgstr "Port sursa"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Zona sursa"
@@ -678,8 +611,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -726,14 +659,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -760,17 +685,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -792,7 +717,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -802,7 +727,7 @@ msgstr "Zone"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "accept"
@@ -851,7 +776,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -884,7 +809,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -893,6 +818,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -903,6 +834,24 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Adaugă"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Adaugă şi editează..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Nu rescrie"
+
+#~ msgid "External zone"
+#~ msgstr "Zonă externă"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Regulă nouă SNAT"
+
+#~ msgid "Other..."
+#~ msgstr "Altele..."
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Intrare fără nume)"
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index 1ddb6a580e..ca8dc439c0 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -62,19 +62,7 @@ msgstr "Принимать исходящий трафик"
msgid "Action"
msgstr "Действие"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Добавить"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Добавить и редактировать..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
@@ -84,7 +72,7 @@ msgstr ""
"назначения, например <code>-p tcp --dport 443</code> для соответствия только "
"исходящему HTTPS трафику."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -99,15 +87,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Дополнительные настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Разрешить «недействительный» трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Разрешить перенаправление из <em>'зон источников'</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Разрешить перенаправление в <em>'зоны назначения'</em>:"
@@ -120,11 +108,11 @@ msgstr "Любой"
msgid "Any day"
msgstr "Любой день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Автоматическое назначение помощников"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -135,19 +123,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr "Отслеживание соединений (conntrack)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr "Помощники отслеживания соединений"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Охватываемые устройства"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Охватываемые сети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Охватываемые подсети"
@@ -175,8 +163,6 @@ msgid "Destination port"
msgstr "Порт назначения"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Зона назначения"
@@ -199,7 +185,7 @@ msgstr "Отклонять входящий трафик"
msgid "Discard output"
msgstr "Отклонять исходящий трафик"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
@@ -208,11 +194,6 @@ msgstr ""
"трафика с состоянием <em>недействительный</em> (<em>invalid</em>). Это может "
"потребоваться для сложных настроек асимметричной маршрутизации."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписывать"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -246,7 +227,7 @@ msgstr "Включить NAT Loopback"
msgid "Enable SYN-flood protection"
msgstr "Включить защиту от SYN-flood атак"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Включить журналирование в этой зоне"
@@ -254,7 +235,7 @@ msgstr "Включить журналирование в этой зоне"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Экспериментальный функционал. Не полностью совместим с QoS/SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
"Явно определяет допустимые варианты помощников (helpers) отслеживания "
@@ -265,21 +246,15 @@ msgid "External IP address"
msgstr "Внешний IP-адрес"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Внешний порт"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Внешняя зона"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Дополнительные аргументы"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Дополнительные аргументы для назначения"
@@ -287,7 +262,7 @@ msgstr "Дополнительные аргументы для назначен
msgid "Extra iptables arguments"
msgstr "Дополнительные аргументы iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Дополнительные аргументы для источника"
@@ -311,12 +286,12 @@ msgstr "Межсетевой экран - Правила для трафика"
msgid "Firewall - Zone Settings"
msgstr "Межсетевой экран - Настройка зон"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Принудительно включать отслеживание соединений"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Перенаправление"
@@ -388,12 +363,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 и IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Только IPv4"
@@ -402,31 +377,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Только IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Входящий трафик"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Внутренний IP-адрес"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Внутренний порт"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Внутренняя зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Ограничить журнал сообщений"
@@ -440,11 +412,11 @@ msgstr "MAC-адрес"
msgid "MACs"
msgstr "MAC-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Ограничение MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Маскарадинг"
@@ -476,11 +448,7 @@ msgstr "Дни месяца"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Имя"
@@ -488,28 +456,6 @@ msgstr "Имя"
msgid "Network"
msgstr "Сеть"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Новое правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Новое правило перенаправления"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Новое правило для входящего трафика"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Новое перенаправление порта"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новый SNAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -533,17 +479,8 @@ msgstr ""
"Применять правило только для входящего трафика от указанного порта или "
"диапазона портов клиентского хоста"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Открыть порты на маршрутизаторе"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Другое..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Исходящий трафик"
@@ -554,7 +491,7 @@ msgstr ""
"Передаёт дополнительные аргументы таблице iptables. Используйте с "
"осторожностью!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -581,7 +518,7 @@ msgstr ""
"Перенаправленные портов позволяет удалённым компьютерам из Интернета "
"соединяться с компьютером или службой внутри частной локальной сети."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -591,8 +528,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Протокол"
@@ -631,16 +566,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Перезапустить межсетевой экран"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-получателей"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Использовать маскарадинг только для указанных подсетей-отправителей"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Использовать протокол"
@@ -688,8 +623,6 @@ msgstr "Порт источника"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "Зона источника"
@@ -719,8 +652,8 @@ msgid ""
"traffic flow."
msgstr "Межсетевой экран создает зоны в вашей сети для контроля трафика."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -737,7 +670,7 @@ msgstr ""
"перенаправление из lan в wan <em>'не'</em> допускает перенаправление трафика "
"из wan в lan."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -780,14 +713,6 @@ msgstr "К %s на <var>этом устройстве</var>"
msgid "To %s, %s in %s"
msgstr "К %s, %s в %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "К IP-адресу источника"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "К порту источника"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -817,11 +742,11 @@ msgstr "Перенаправление без имени"
msgid "Unnamed rule"
msgstr "Правило без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Зона без имени"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -829,7 +754,7 @@ msgstr ""
"Используйте эту опцию для классификации трафика зоны по сетевым устройствам, "
"управляемым не через <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -853,7 +778,7 @@ msgstr "Среда"
msgid "Week Days"
msgstr "Дни недели"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Перенаправления"
@@ -863,7 +788,7 @@ msgstr "Зоны"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "принимать"
@@ -912,7 +837,7 @@ msgstr "не отслеживать"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "не обрабатывать"
@@ -945,7 +870,7 @@ msgstr "порты"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "отвергать"
@@ -954,6 +879,12 @@ msgstr "отвергать"
msgid "second"
msgstr "секунда"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -964,5 +895,44 @@ msgstr "тип"
msgid "types"
msgstr "типы"
+#~ msgid "Add"
+#~ msgstr "Добавить"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Добавить и редактировать..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Не перезаписывать"
+
+#~ msgid "External zone"
+#~ msgstr "Внешняя зона"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Новое правило SNAT"
+
+#~ msgid "New forward rule"
+#~ msgstr "Новое правило перенаправления"
+
+#~ msgid "New input rule"
+#~ msgstr "Новое правило для входящего трафика"
+
+#~ msgid "New port forward"
+#~ msgstr "Новое перенаправление порта"
+
+#~ msgid "New source NAT"
+#~ msgstr "Новый SNAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Открыть порты на маршрутизаторе"
+
+#~ msgid "Other..."
+#~ msgstr "Другое..."
+
+#~ msgid "To source IP"
+#~ msgstr "К IP-адресу источника"
+
+#~ msgid "To source port"
+#~ msgstr "К порту источника"
+
#~ msgid "Output zone"
#~ msgstr "Исходящая зона"
diff --git a/applications/luci-app-firewall/po/sk/firewall.po b/applications/luci-app-firewall/po/sk/firewall.po
index fa91b5605a..40ea67f271 100644
--- a/applications/luci-app-firewall/po/sk/firewall.po
+++ b/applications/luci-app-firewall/po/sk/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -107,11 +95,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,8 +144,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -224,7 +205,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -232,7 +213,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -241,21 +222,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -263,7 +238,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -287,12 +262,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -364,12 +339,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -378,31 +353,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,11 +388,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -450,11 +422,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,28 +430,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -502,17 +448,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -521,7 +458,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,7 +478,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -549,8 +486,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -586,16 +521,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -643,8 +578,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -674,8 +607,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -722,14 +655,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -788,7 +713,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -798,7 +723,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -847,7 +772,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -880,7 +805,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/sv/firewall.po b/applications/luci-app-firewall/po/sv/firewall.po
index 4d81c1ae9c..d885c03986 100644
--- a/applications/luci-app-firewall/po/sv/firewall.po
+++ b/applications/luci-app-firewall/po/sv/firewall.po
@@ -56,26 +56,14 @@ msgstr ""
msgid "Action"
msgstr "Åtgärd"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Lägg till"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Lägg till och redigera..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -87,15 +75,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Avancerade inställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Tillåt vidarebefordring från <em>källzonerna</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Till vidarebefordring till <em>destinationszonerna:</em>:"
@@ -108,11 +96,11 @@ msgstr "Alla"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -121,19 +109,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Nätverk som omfattas"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -157,8 +145,6 @@ msgid "Destination port"
msgstr "Destinationsport"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "Destinationens zon"
@@ -181,17 +167,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Skriv inte om igen"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -225,7 +206,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Aktivera loggning i den här zonen"
@@ -233,7 +214,7 @@ msgstr "Aktivera loggning i den här zonen"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -242,21 +223,15 @@ msgid "External IP address"
msgstr "Extern IP-adress"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "Extern port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Extern zon"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Extra argument"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -264,7 +239,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -288,12 +263,12 @@ msgstr "Brandvägg - Trafikregler"
msgid "Firewall - Zone Settings"
msgstr "Brandvägg - Zoninställningar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Vidarebefordra"
@@ -365,12 +340,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 och IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Endast IPv4"
@@ -379,31 +354,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Endast IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Inmatning"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "Intern IP-adress"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "Intern port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "Intern zon"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Begränsa loggmeddelanden"
@@ -417,11 +389,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Maskering"
@@ -453,11 +425,7 @@ msgstr "Dagar i månaden"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Namn"
@@ -465,28 +433,6 @@ msgstr "Namn"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Ny SNAT-regel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Ny regel för vidarebefordring"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Ny inmatningsregel"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Ny vidarebefordring av port"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Ny käll-NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -506,17 +452,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Öppna portar i router"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Andra..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Utmatning"
@@ -525,7 +462,7 @@ msgstr "Utmatning"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -545,7 +482,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -553,8 +490,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "Protokoll"
@@ -590,16 +525,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr "Starta om brandvägg"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Begränsa till adressfamilj"
@@ -647,8 +582,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -678,8 +611,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -689,7 +622,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -726,14 +659,6 @@ msgstr "Till %s på <var>den här enheten</var>"
msgid "To %s, %s in %s"
msgstr "Till %s, %s i %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -760,17 +685,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -792,7 +717,7 @@ msgstr "Onsdag"
msgid "Week Days"
msgstr "Veckodagar"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -802,7 +727,7 @@ msgstr "Zoner"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "acceptera"
@@ -851,7 +776,7 @@ msgstr "spåra inte"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "släpp"
@@ -884,7 +809,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "neka"
@@ -893,6 +818,12 @@ msgstr "neka"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -903,6 +834,39 @@ msgstr ""
msgid "types"
msgstr ""
+#~ msgid "Add"
+#~ msgstr "Lägg till"
+
+#~ msgid "Add and edit..."
+#~ msgstr "Lägg till och redigera..."
+
+#~ msgid "Do not rewrite"
+#~ msgstr "Skriv inte om igen"
+
+#~ msgid "External zone"
+#~ msgstr "Extern zon"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "Ny SNAT-regel"
+
+#~ msgid "New forward rule"
+#~ msgstr "Ny regel för vidarebefordring"
+
+#~ msgid "New input rule"
+#~ msgstr "Ny inmatningsregel"
+
+#~ msgid "New port forward"
+#~ msgstr "Ny vidarebefordring av port"
+
+#~ msgid "New source NAT"
+#~ msgstr "Ny käll-NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "Öppna portar i router"
+
+#~ msgid "Other..."
+#~ msgstr "Andra..."
+
#~ msgid "(Unnamed Entry)"
#~ msgstr "(Namnlös post)"
diff --git a/applications/luci-app-firewall/po/templates/firewall.pot b/applications/luci-app-firewall/po/templates/firewall.pot
index 5c414af049..492d8aa8e4 100644
--- a/applications/luci-app-firewall/po/templates/firewall.pot
+++ b/applications/luci-app-firewall/po/templates/firewall.pot
@@ -48,26 +48,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -79,15 +67,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -100,11 +88,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -113,19 +101,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -149,8 +137,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr ""
@@ -173,17 +159,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -217,7 +198,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -225,7 +206,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -234,21 +215,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -256,7 +231,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -280,12 +255,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -357,12 +332,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -371,31 +346,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -409,11 +381,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -443,11 +415,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -455,28 +423,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -495,17 +441,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -514,7 +451,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -534,7 +471,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -542,8 +479,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -579,16 +514,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -636,8 +571,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -667,12 +600,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
-msgid "this new zone"
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -682,7 +611,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:90
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -719,14 +648,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -753,17 +674,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -785,7 +706,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -795,7 +716,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -844,7 +765,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -877,7 +798,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -886,6 +807,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/tr/firewall.po b/applications/luci-app-firewall/po/tr/firewall.po
index 5dc58f7810..1113306375 100644
--- a/applications/luci-app-firewall/po/tr/firewall.po
+++ b/applications/luci-app-firewall/po/tr/firewall.po
@@ -55,26 +55,14 @@ msgstr ""
msgid "Action"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -86,15 +74,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -107,11 +95,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -120,19 +108,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -156,8 +144,6 @@ msgid "Destination port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr ""
@@ -180,17 +166,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -224,7 +205,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -232,7 +213,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -241,21 +222,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -263,7 +238,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -287,12 +262,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -364,12 +339,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -378,31 +353,28 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -416,11 +388,11 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -450,11 +422,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -462,28 +430,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -502,17 +448,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr ""
@@ -521,7 +458,7 @@ msgstr ""
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -541,7 +478,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -549,8 +486,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -586,16 +521,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -643,8 +578,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr ""
@@ -674,8 +607,8 @@ msgid ""
"traffic flow."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -685,7 +618,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -722,14 +655,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -756,17 +681,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -788,7 +713,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -798,7 +723,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr ""
@@ -847,7 +772,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr ""
@@ -880,7 +805,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr ""
@@ -889,6 +814,12 @@ msgstr ""
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/uk/firewall.po b/applications/luci-app-firewall/po/uk/firewall.po
index f1a9a084b7..8dd0b5a0a6 100644
--- a/applications/luci-app-firewall/po/uk/firewall.po
+++ b/applications/luci-app-firewall/po/uk/firewall.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"PO-Revision-Date: 2019-07-30 02:30+0300\n"
+"PO-Revision-Date: 2019-09-21 22:10+0300\n"
"Last-Translator: Yurii <yuripet@gmail.com>\n"
"Language-Team: none\n"
"Language: uk\n"
@@ -9,7 +9,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:146
msgid "%s in %s"
msgstr "%s у %s"
@@ -18,7 +18,7 @@ msgstr "%s у %s"
msgid "%s%s with %s"
msgstr "%s%s із %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:143
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:144
msgid "%s, %s in %s"
msgstr "%s, %s у %s"
@@ -51,102 +51,90 @@ msgstr "Приймати вхідний"
msgid "Accept output"
msgstr "Приймати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:182
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:325
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
msgid "Action"
msgstr "Дія"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "Додати"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "Додати та редагувати..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб "
-"зіставляти лише вихідний трафік HTTPS."
+"призначення зони, наприклад, <code>-p tcp --dport 443</code>, щоб зіставляти "
+"лише вихідний трафік HTTPS."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
msgstr ""
-"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку "
-"джерела зони, наприклад, <code>-p tcp --sport 443</code>, щоб "
-"зіставляти лише вхідний трафік HTTPS."
+"Додаткові аргументи raw <em>iptables</em> для класифікації трафіку джерела "
+"зони, наприклад, <code>-p tcp --sport 443</code>, щоб зіставляти лише "
+"вхідний трафік HTTPS."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:84
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:101
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
msgid "Advanced Settings"
msgstr "Розширені настройки"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr "Дозволити \"неправильний\" трафік"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:304
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "Дозволити переспрямовування від <em>зон джерела</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:263
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Дозволити переспрямовування до <em>зон призначення</em>:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:208
msgid "Any"
msgstr "Будь-який"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:341
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:357
msgid "Any day"
msgstr "Будь-який день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr "Автоматичне призначення помічника"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
-"Автоматично призначати помічників відслідковування з'єднань (<abbr "
-"title=\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та "
-"порту трафіку"
+"Автоматично призначати помічників відслідковування з'єднань (<abbr title="
+"\"Connection tracking\">Conntrack</abbr>) на підставі протоколу та порту "
+"трафіку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:85
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:79
msgid "Conntrack Settings"
msgstr ""
-"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking\">"
-"Conntrack</abbr>)"
+"Параметри відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking\">"
-"Conntrack</abbr>)"
+"Помічники відслідковування з'єднань (<abbr title=\"Connection tracking"
+"\">Conntrack</abbr>)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr "Охоплені пристрої"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:135
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "Охоплені мережі"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr "Охоплені підмережі"
@@ -165,17 +153,15 @@ msgstr ""
"виконуються після кожного перезавантаження брандмауера, відразу після "
"завантаження типового набору правил."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:305
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
msgid "Destination address"
msgstr "Адреса призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:316
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
msgid "Destination port"
msgstr "Порт призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:299
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
msgid "Destination zone"
msgstr "Зона призначення"
@@ -198,19 +184,14 @@ msgstr "Відкидати вхідний"
msgid "Discard output"
msgstr "Відкидати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:207
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-"Не встановлювати додаткові правила для відхилення переспрямованого трафіку зі "
-"станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися для "
-"складних налаштувань асиметричного маршруту."
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "Не перезаписувати"
+"Не встановлювати додаткові правила для відхилення переспрямованого трафіку "
+"зі станом відслідковування з'єднань <em>invalid</em>. Це може знадобитися "
+"для складних налаштувань асиметричного маршруту."
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
@@ -227,64 +208,60 @@ msgstr "Не відслідковувати вхідний"
msgid "Do not track output"
msgstr "Не відслідковувати вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:42
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:36
msgid "Drop invalid packets"
msgstr "Відкидати помилкові пакети"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:148
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:149
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:189
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:246
msgid "Enable"
msgstr "Увімкнути"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:262
msgid "Enable NAT Loopback"
msgstr "Увімкнути NAT Loopback"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
msgid "Enable SYN-flood protection"
msgstr "Увімкнути захист від SYN-flood"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:220
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "Увімкнути реєстрування у цій зоні"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:54
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "Експериментальна функція. Не повністю сумісно з QoS / SQM."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
-msgstr "В явному вигляді дозволені помічники відслідковування з'єднань для трафіку зони"
+msgstr ""
+"В явному вигляді дозволені помічники відслідковування з'єднань для трафіку "
+"зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:209
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
msgid "External IP address"
msgstr "Зовнішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:222
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
msgid "External port"
msgstr "Зовнішній порт"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "Зовнішня зона"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:266
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "Додаткові аргументи"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:245
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr "Додаткові аргументи для призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:86
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:80
msgid "Extra iptables arguments"
msgstr "Додаткові аргументи iptables"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:235
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr "Додаткові аргументи для джерела"
@@ -296,32 +273,32 @@ msgstr "Брандмауер"
msgid "Firewall - Custom Rules"
msgstr "Брандмауер — Настроювані правила"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:91
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
msgid "Firewall - Port Forwards"
msgstr "Брандмауер — Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
msgid "Firewall - Traffic Rules"
msgstr "Брандмауер — Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:34
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:28
msgid "Firewall - Zone Settings"
msgstr "Брандмауер — Параметри зон"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "Примусове відслідковування з'єднань"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:134
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:135
msgid "Forward to"
msgstr "переспрямовування до"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
msgid "Friday"
msgstr "П'ятниця"
@@ -352,15 +329,15 @@ msgstr "Від %s на <var>цьому пристрої</var> з джерело
msgid "From %s on <var>this device</var> with source %s and %s"
msgstr "Від %s на <var>цьому пристрої</var> з джерелом %s та %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:99
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:135
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:37
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:83
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:100
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:136
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:77
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:9
msgid "General Settings"
msgstr "Загальні параметри"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:71
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:65
msgid "Hardware flow offloading"
msgstr "Апаратні засоби розвантаження потоку"
@@ -384,13 +361,13 @@ msgid "IPv4"
msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:200
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 та IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "Лише IPv4"
@@ -398,32 +375,29 @@ msgstr "Лише IPv4"
msgid "IPv6"
msgstr "IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:187
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "Лише IPv6"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Вхідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:238
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
msgid "Internal IP address"
msgstr "Внутрішня IP-адреса"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:250
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
msgid "Internal port"
msgstr "Внутрішній порт"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:232
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
msgid "Internal zone"
msgstr "Внутрішня зона"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "Обмеження повідомлень журналу"
@@ -437,24 +411,24 @@ msgstr "MAC-адреса"
msgid "MACs"
msgstr "MAC-адреси"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:132
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "Затискання MSS"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:129
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "Підміна"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:124
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:172
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:173
msgid "Match"
msgstr "Зіставляти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:217
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:218
msgid "Match ICMP type"
msgstr "Зіставляти ICMP типу"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:224
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
@@ -462,22 +436,18 @@ msgstr ""
"Зіставляти вхідний трафік, спрямований на заданий порт призначення або "
"діапазон портів цього вузла."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:343
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
msgid "Monday"
msgstr "Понеділок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:350
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:353
msgid "Month Days"
msgstr "Дні місяця"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:120
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:168
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:194
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:98
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "Ім'я"
@@ -485,41 +455,19 @@ msgstr "Ім'я"
msgid "Network"
msgstr "Мережа"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "Нове правило SNAT"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "Нове правило переспрямовування"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "Нове вхідне правило"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "Нове переспрямовування порту"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "Новий NAT джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:210
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "Зіставляти тільки вхідний трафік, спрямований на задану IP-адресу."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:174
msgid "Only match incoming traffic from these MACs."
msgstr "Зіставляти тільки вхідний трафік від цих MAC-адрес."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:187
msgid "Only match incoming traffic from this IP or range."
msgstr "Зіставляти тільки вхідний трафік від цього IP чи діапазону."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:200
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
@@ -527,27 +475,18 @@ msgstr ""
"Зіставляти тільки вхідний трафік, що виникає на заданому порту джерела або "
"діапазоні портів вузла клієнта."
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "Відкрити порти на роутері"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "Інше..."
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
"Передача додаткових аргументів для IPTables. Використовуйте з обережністю!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:232
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -556,17 +495,17 @@ msgid ""
"all services."
msgstr ""
"Передавання аргументів raw iptables до правил класифікації вихідного трафіку "
-"та трафіку призначення дозволяє зіставляти пакети на підставі інших критеріїв, "
-"ніж інтерфейси чи підмережі. Ці параметри слід використовувати з особливою "
-"обережністю, оскільки невірні значення можуть призвести до порушення набору "
-"правил брандмауера, повністю відкриваючи всі служби."
+"та трафіку призначення дозволяє зіставляти пакети на підставі інших "
+"критеріїв, ніж інтерфейси чи підмережі. Ці параметри слід використовувати з "
+"особливою обережністю, оскільки невірні значення можуть призвести до "
+"порушення набору правил брандмауера, повністю відкриваючи всі служби."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:95
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:12
msgid "Port Forwards"
msgstr "Переспрямовування портів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:92
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:93
msgid ""
"Port forwarding allows remote computers on the Internet to connect to a "
"specific computer or service within the private LAN."
@@ -574,7 +513,7 @@ msgstr ""
"Переспрямовування портів дозволяє віддаленим комп'ютерам з Інтернету "
"підключатися до певного комп'ютера або служби у приватній мережі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -582,20 +521,18 @@ msgstr ""
"Запобігати встановленню правил NOTRACK, які могли б обійти відслідковування "
"з'єднань."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:153
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:204
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
msgid "Protocol"
msgstr "Протокол"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:252
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
"Переспрямувати відповідний вхідний трафік на заданий порт внутрішнього вузла"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:240
msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "Переспрямувати відповідний вхідний трафік на заданий внутрішній вузол"
@@ -614,7 +551,7 @@ msgstr "Відхиляти вхідний"
msgid "Refuse output"
msgstr "Відхиляти вихідний"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "Необхідна апаратна підтримка NAT. Упроваджено принаймні для mt7621"
@@ -622,20 +559,20 @@ msgstr "Необхідна апаратна підтримка NAT. Упрова
msgid "Restart Firewall"
msgstr "Перезавантажити брандмауер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:197
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "Обмежити підміну заданими підмережами призначення"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "Обмежити підміну заданими підмережами джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:197
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "Обмежити сімейство протоколів"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:59
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
msgid "Routing/NAT Offloading"
msgstr "Розвантаження маршрутизації/NAT"
@@ -647,64 +584,62 @@ msgstr "Правило вимкнено"
msgid "Rule is enabled"
msgstr "Правило ввімкнено"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:351
msgid "Saturday"
msgstr "Субота"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:67
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:61
msgid "Software based offloading for routing/NAT"
msgstr "Програмне розвантаження для маршрутизації/NAT"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:66
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:60
msgid "Software flow offloading"
msgstr "Програмне розвантаження потоку"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:186
msgid "Source IP address"
msgstr "IP-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:172
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:268
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
msgid "Source MAC address"
msgstr "MAC-адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:279
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
msgid "Source address"
msgstr "Адреса джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:290
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:199
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
msgid "Source port"
msgstr "Порт джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:166
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:262
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
msgid "Source zone"
msgstr "Зона джерела"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:366
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:369
msgid "Start Date (yyyy-mm-dd)"
msgstr "Дата початку (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:358
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:361
msgid "Start Time (hh.mm.ss)"
msgstr "Час початку (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:370
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:373
msgid "Stop Date (yyyy-mm-dd)"
msgstr "Дата зупинки (рррр-мм-дд)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:362
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:365
msgid "Stop Time (hh.mm.ss)"
msgstr "Час зупинки (гг:хх:сс)"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:342
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
msgid "Sunday"
msgstr "Неділя"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:35
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:29
msgid ""
"The firewall creates zones over your network interfaces to control network "
"traffic flow."
@@ -712,8 +647,8 @@ msgstr ""
"Брандмауер створює зони поверх ваших мережевих інтерфейсів для управління "
"потоком мережевого трафіку."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:171
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:259
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -730,7 +665,7 @@ msgstr ""
"від LAN до WAN <em>не</em> означає, що є також дозвіл спрямовувати від WAN "
"до LAN."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -744,15 +679,15 @@ msgstr ""
"трафіку між різними мережами в межах зони. Пункт <em>Покриті мережі</em> "
"визначає, які доступні мережі є членами цієї зони."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:346
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:349
msgid "Thursday"
msgstr "Четвер"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:138
msgid "Time Restrictions"
msgstr "Часові обмеження"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:374
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:377
msgid "Time in UTC"
msgstr "Час в UTC"
@@ -772,20 +707,12 @@ msgstr "%s на <var>цього пристрою</var>"
msgid "To %s, %s in %s"
msgstr "%s, %s у %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "До IP джерела"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "До порту джерела"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
msgstr "Правила трафіка"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:128
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:129
msgid ""
"Traffic rules define policies for packets traveling between different zones, "
"for example to reject traffic between certain hosts or to open WAN ports on "
@@ -795,25 +722,25 @@ msgstr ""
"різними зонами, наприклад, відхиляти трафік між певними вузлами або відкрити "
"порти WAN на маршрутизаторі."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:344
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:347
msgid "Tuesday"
msgstr "Вівторок"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:107
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:108
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:122
msgid "Unnamed forward"
msgstr "Переспрямовування без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:144
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:145
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:170
msgid "Unnamed rule"
msgstr "Правило без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:99
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr "Зона без назви"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:175
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
@@ -821,7 +748,7 @@ msgstr ""
"Використовуйте цей параметр для класифікації трафіку зон за мережевими "
"пристроями <em>raw</em>, які не управляються через <em>uci</em>."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:179
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -837,44 +764,44 @@ msgstr "Через %s"
msgid "Via %s at %s"
msgstr "Через %s на %s"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:345
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:348
msgid "Wednesday"
msgstr "Середа"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:337
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:340
msgid "Week Days"
msgstr "Дні тижня"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:109
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "Зона ⇒ Переспрямовування"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:78
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:72
msgid "Zones"
msgstr "Зони"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:329
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:125
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "приймати"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:177
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:190
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:214
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:254
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:222
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:271
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:282
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:293
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:308
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:319
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:178
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:191
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:204
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:215
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:255
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:223
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:274
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:285
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:296
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:311
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:322
msgid "any"
msgstr "будь-який"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:53
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:139
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:58
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:85
msgid "any host"
@@ -888,7 +815,7 @@ msgstr "будь-який IP роутера"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:182
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:137
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:138
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:110
msgid "any zone"
msgstr "будь-якій зоні"
@@ -898,13 +825,13 @@ msgstr "будь-якій зоні"
msgid "day"
msgstr "день"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:334
msgid "don't track"
msgstr "не відстеж."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:52
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:124
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "опускати"
@@ -935,9 +862,9 @@ msgstr "порт"
msgid "ports"
msgstr "порти"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:330
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:51
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "відкидати"
@@ -946,6 +873,12 @@ msgstr "відкидати"
msgid "second"
msgstr "секунду"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr "ця нова зона"
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/vi/firewall.po b/applications/luci-app-firewall/po/vi/firewall.po
index 6cda161c22..31868bac62 100644
--- a/applications/luci-app-firewall/po/vi/firewall.po
+++ b/applications/luci-app-firewall/po/vi/firewall.po
@@ -60,26 +60,14 @@ msgstr ""
msgid "Action"
msgstr "Action"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr ""
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -91,15 +79,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr ""
@@ -112,11 +100,11 @@ msgstr ""
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -125,19 +113,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "Cổng điểm đến"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
#, fuzzy
msgid "Destination zone"
msgstr "Điểm đến"
@@ -186,17 +172,12 @@ msgstr ""
msgid "Discard output"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -231,7 +212,7 @@ msgstr ""
msgid "Enable SYN-flood protection"
msgstr "SYN-flood bảo vệ "
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr ""
@@ -239,7 +220,7 @@ msgstr ""
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -248,21 +229,15 @@ msgid "External IP address"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "External port"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -270,7 +245,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -294,12 +269,12 @@ msgstr ""
msgid "Firewall - Zone Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr ""
@@ -371,12 +346,12 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr ""
@@ -385,33 +360,30 @@ msgid "IPv6"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "Input"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
#, fuzzy
msgid "Internal IP address"
msgstr "Internal address"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
#, fuzzy
msgid "Internal port"
msgstr "External port"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr ""
@@ -425,12 +397,12 @@ msgstr ""
msgid "MACs"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
#, fuzzy
msgid "MSS clamping"
msgstr "MSS Clamping"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr ""
@@ -460,11 +432,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr ""
@@ -472,28 +440,6 @@ msgstr ""
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
@@ -512,17 +458,8 @@ msgid ""
"range on the client host"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "Output"
@@ -531,7 +468,7 @@ msgstr "Output"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -551,7 +488,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -559,8 +496,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr ""
@@ -596,16 +531,16 @@ msgstr ""
msgid "Restart Firewall"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr ""
@@ -655,8 +590,6 @@ msgstr "Cổng nguồn"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
#, fuzzy
msgid "Source zone"
msgstr "Cổng nguồn"
@@ -689,8 +622,8 @@ msgstr ""
"The firewall tạo zones trên giao diện mạng lưới để điều triển sự dòng lưu "
"thông của mạng."
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -700,7 +633,7 @@ msgid ""
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -737,14 +670,6 @@ msgstr ""
msgid "To %s, %s in %s"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr ""
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr ""
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr ""
msgid "Unnamed rule"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,7 +728,7 @@ msgstr ""
msgid "Week Days"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr ""
@@ -813,7 +738,7 @@ msgstr "Zones"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "chấp nhận"
@@ -862,7 +787,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "drop"
@@ -895,7 +820,7 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "Không chấp nhận"
@@ -904,6 +829,12 @@ msgstr "Không chấp nhận"
msgid "second"
msgstr ""
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index 5264f5105e..28cd88b5c9 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -58,26 +58,14 @@ msgstr "接受出站"
msgid "Action"
msgstr "动作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "添加"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "添加并编辑…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "高级设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "允许从<em>源区域</em>转发:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允许转发到<em>目标区域</em>:"
@@ -110,11 +98,11 @@ msgstr "任何"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "覆盖网络"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "目标端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "目标区域"
@@ -185,17 +171,12 @@ msgstr "丢弃入站"
msgid "Discard output"
msgstr "丢弃出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重写"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -229,7 +210,7 @@ msgstr "启用 NAT 环回"
msgid "Enable SYN-flood protection"
msgstr "启用 SYN-flood 防御"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "启用此区域的日志记录"
@@ -237,7 +218,7 @@ msgstr "启用此区域的日志记录"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "实验特性。与 QoS/SQM 不完全兼容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -246,21 +227,15 @@ msgid "External IP address"
msgstr "外部 IP 地址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "外部端口"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部区域"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "附加参数"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -268,7 +243,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -292,12 +267,12 @@ msgstr "防火墙 - 通信规则"
msgid "Firewall - Zone Settings"
msgstr "防火墙 - 区域设置"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "强制连接追踪"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "转发"
@@ -369,12 +344,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "仅 IPv4"
@@ -383,31 +358,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "仅 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "入站数据"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "内部 IP 地址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "内部端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "内部区域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日志信息"
@@ -421,11 +393,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS 钳制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "IP 动态伪装"
@@ -455,11 +427,7 @@ msgstr "日期"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -467,28 +435,6 @@ msgstr "名字"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建转发规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建进入规则"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建端口转发"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "仅匹配指定目的 IP 地址的入站流量。"
@@ -507,17 +453,8 @@ msgid ""
"range on the client host"
msgstr "仅匹配源自客户端主机上给定源端口或源端口范围的入站流量。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "打开路由器端口"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "出站数据"
@@ -526,7 +463,7 @@ msgstr "出站数据"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "传递到 iptables 的额外参数。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -547,7 +484,7 @@ msgid ""
msgstr ""
"端口转发允许 Internet 上的远程计算机连接到内部网络中的特定计算机或服务。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -555,8 +492,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "协议"
@@ -592,16 +527,16 @@ msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
msgid "Restart Firewall"
msgstr "重启防火墙"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 动态伪装的目标子网"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 动态伪装的源子网"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "限制地址"
@@ -649,8 +584,6 @@ msgstr "源端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "源区域"
@@ -680,8 +613,8 @@ msgid ""
"traffic flow."
msgstr "防火墙通过在网络接口上创建区域来控制网络流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -695,7 +628,7 @@ msgstr ""
"strong> 的区域的需转发流量。转发规则的作用是<em>单向</em>的,例如:一条允许"
"从 lan 到 wan 的转发规则并不隐含有允许相反方向从 wan 到 lan 的流量转发。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -735,14 +668,6 @@ msgstr "到 %s 位于<var>本设备</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位于 %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源端口"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -771,17 +696,17 @@ msgstr "未命名转发"
msgid "Unnamed rule"
msgstr "未命名规则"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -803,7 +728,7 @@ msgstr "星期三"
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "区域 ⇒ 转发"
@@ -813,7 +738,7 @@ msgstr "区域"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "接受"
@@ -862,7 +787,7 @@ msgstr "不跟踪"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "丢弃"
@@ -895,7 +820,7 @@ msgstr "端口"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒绝"
@@ -904,6 +829,12 @@ msgstr "拒绝"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -914,6 +845,45 @@ msgstr "类型"
msgid "types"
msgstr "类型"
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Add and edit..."
+#~ msgstr "添加并编辑…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重写"
+
+#~ msgid "External zone"
+#~ msgstr "外部区域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 规则"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建转发规则"
+
+#~ msgid "New input rule"
+#~ msgstr "新建进入规则"
+
+#~ msgid "New port forward"
+#~ msgstr "新建端口转发"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "打开路由器端口"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源端口"
+
#~ msgid "Output zone"
#~ msgstr "出站区域"
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index de8aa416e6..9754bc7a57 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -58,26 +58,14 @@ msgstr "接受出站"
msgid "Action"
msgstr "動作"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:68
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:31
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:69
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:58
-msgid "Add"
-msgstr "新增"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:64
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:53
-msgid "Add and edit..."
-msgstr "新增並編輯…"
-
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone destination "
"traffic, e.g. <code>-p tcp --dport 443</code> to only match outbound HTTPS "
"traffic."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid ""
"Additional raw <em>iptables</em> arguments to classify zone source traffic, "
"e.g. <code>-p tcp --sport 443</code> to only match inbound HTTPS traffic."
@@ -89,15 +77,15 @@ msgstr ""
msgid "Advanced Settings"
msgstr "高階設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid "Allow \"invalid\" traffic"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:302
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:311
msgid "Allow forward from <em>source zones</em>:"
msgstr "允許從<em>源區域</em>轉發:"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:261
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:270
msgid "Allow forward to <em>destination zones</em>:"
msgstr "允許轉發到<em>目標區域</em>:"
@@ -110,11 +98,11 @@ msgstr "任何"
msgid "Any day"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid "Automatic helper assignment"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:214
msgid ""
"Automatically assign conntrack helpers based on traffic protocol and port"
msgstr ""
@@ -123,19 +111,19 @@ msgstr ""
msgid "Conntrack Settings"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Conntrack helpers"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid "Covered devices"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:133
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:137
msgid "Covered networks"
msgstr "覆蓋網路"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid "Covered subnets"
msgstr ""
@@ -161,8 +149,6 @@ msgid "Destination port"
msgstr "目標埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:302
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:42
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:21
msgid "Destination zone"
msgstr "目標區域"
@@ -185,17 +171,12 @@ msgstr "丟棄入站"
msgid "Discard output"
msgstr "丟棄出站"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:205
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:211
msgid ""
"Do not install extra rules to reject forwarded traffic with conntrack state "
"<em>invalid</em>. This may be required for complex asymmetric route setups."
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:45
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:50
-msgid "Do not rewrite"
-msgstr "不重寫"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:297
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:218
msgid "Do not track forward"
@@ -229,7 +210,7 @@ msgstr "啟用 NAT 環回"
msgid "Enable SYN-flood protection"
msgstr "啟用 SYN-flood 防禦"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:224
msgid "Enable logging on this zone"
msgstr "啟用此區域的日誌記錄"
@@ -237,7 +218,7 @@ msgstr "啟用此區域的日誌記錄"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
msgstr "實驗特性。與 QoS/SQM 不完全相容。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:212
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:218
msgid "Explicitly choses allowed connection tracking helpers for zone traffic"
msgstr ""
@@ -246,21 +227,15 @@ msgid "External IP address"
msgstr "外部 IP 位址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:223
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:28
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:12
msgid "External port"
msgstr "外部埠"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:27
-msgid "External zone"
-msgstr "外部區域"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:267
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:336
msgid "Extra arguments"
msgstr "附加引數"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:243
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:249
msgid "Extra destination arguments"
msgstr ""
@@ -268,7 +243,7 @@ msgstr ""
msgid "Extra iptables arguments"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:233
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:239
msgid "Extra source arguments"
msgstr ""
@@ -292,12 +267,12 @@ msgstr "防火牆 - 通訊規則"
msgid "Firewall - Zone Settings"
msgstr "防火牆 - 區域設定"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid "Force connection tracking"
msgstr "強制連線追蹤"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:41
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:113
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
msgid "Forward"
msgstr "轉發"
@@ -369,12 +344,12 @@ msgstr "IPv4"
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:220
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:201
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:189
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:202
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:184
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:190
msgid "IPv4 only"
msgstr "僅 IPv4"
@@ -383,31 +358,28 @@ msgid "IPv6"
msgstr "IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:203
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:185
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:191
msgid "IPv6 only"
msgstr "僅 IPv6"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:39
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:111
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:115
msgid "Input"
msgstr "入站資料"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:239
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:30
msgid "Internal IP address"
msgstr "內部 IP 位址"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:251
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:31
msgid "Internal port"
msgstr "內部埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:233
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:29
msgid "Internal zone"
msgstr "內部區域"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:221
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:227
msgid "Limit log messages"
msgstr "限制日誌資訊"
@@ -421,11 +393,11 @@ msgstr "MAC"
msgid "MACs"
msgstr "MAC"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:130
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:134
msgid "MSS clamping"
msgstr "MSS 鉗制"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:127
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:131
msgid "Masquerading"
msgstr "IP 動態偽裝"
@@ -455,11 +427,7 @@ msgstr "日期"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:121
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:169
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:195
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:92
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:25
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:10
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:40
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:19
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
msgid "Name"
msgstr "名字"
@@ -467,28 +435,6 @@ msgstr "名字"
msgid "Network"
msgstr ""
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:28
-msgid "New SNAT rule"
-msgstr "新建 SNAT 規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:37
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:47
-msgid "New forward rule"
-msgstr "新建轉發規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:17
-msgid "New input rule"
-msgstr "新建進入規則"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:22
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:36
-msgid "New port forward"
-msgstr "新建埠轉發"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:16
-msgid "New source NAT"
-msgstr "新建 Source NAT"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:211
msgid "Only match incoming traffic directed at the given IP address."
msgstr "僅匹配指定目的 IP 位址的入站流量。"
@@ -507,17 +453,8 @@ msgid ""
"range on the client host"
msgstr "僅匹配源自客戶端主機上給定源埠或源埠範圍的入站流量。"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:7
-msgid "Open ports on router"
-msgstr "開啟路由器埠"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:43
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:24
-msgid "Other..."
-msgstr "其它..."
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:40
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:112
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:116
msgid "Output"
msgstr "出站資料"
@@ -526,7 +463,7 @@ msgstr "出站資料"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "傳遞到 iptables 的額外引數。小心使用!"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:230
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:236
msgid ""
"Passing raw iptables arguments to source and destination traffic "
"classification rules allows to match packets based on other criteria than "
@@ -546,7 +483,7 @@ msgid ""
"specific computer or service within the private LAN."
msgstr "埠轉發允許 Internet 上的遠端計算機連線到內部網路中的特定計算機或服務。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:202
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:208
msgid ""
"Prevent the installation of <em>NOTRACK</em> rules which would bypass "
"connection tracking."
@@ -554,8 +491,6 @@ msgstr ""
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:154
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:205
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm:26
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:11
msgid "Protocol"
msgstr "協議"
@@ -591,16 +526,16 @@ msgstr "需要硬體 NAT 支援。目前 mt7621 已實現"
msgid "Restart Firewall"
msgstr "重啟防火牆"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:195
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:201
msgid "Restrict Masquerading to given destination subnets"
msgstr "要限制 IP 動態偽裝的目標子網"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:194
msgid "Restrict Masquerading to given source subnets"
msgstr "要限制 IP 動態偽裝的源子網"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:198
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:182
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:188
msgid "Restrict to address family"
msgstr "限制位址"
@@ -648,8 +583,6 @@ msgstr "源埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js:167
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:265
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm:41
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:20
msgid "Source zone"
msgstr "源區域"
@@ -679,8 +612,8 @@ msgid ""
"traffic flow."
msgstr "防火牆通過在網路介面上建立區域來控制網路流量。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:169
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:257
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:174
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:266
msgid ""
"The options below control the forwarding policies between this zone (%s) and "
"other zones. <em>Destination zones</em> cover forwarded traffic "
@@ -694,7 +627,7 @@ msgstr ""
"strong> 的區域的需轉發流量。轉發規則的作用是<em>單向</em>的,例如:一條允許"
"從 lan 到 wan 的轉發規則並不隱含有允許相反方向從 wan 到 lan 的流量轉發。"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:89
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
"<em>output</em> options set the default policies for traffic entering and "
@@ -734,14 +667,6 @@ msgstr "到 %s 位於<var>本裝置</var>"
msgid "To %s, %s in %s"
msgstr "到 %s, %s 位於 %s"
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:22
-msgid "To source IP"
-msgstr "到源 IP"
-
-#: applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm:23
-msgid "To source port"
-msgstr "到源埠"
-
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:131
#: applications/luci-app-firewall/luasrc/controller/firewall.lua:15
msgid "Traffic Rules"
@@ -770,17 +695,17 @@ msgstr "未命名轉發"
msgid "Unnamed rule"
msgstr "未命名規則"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:93
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:94
msgid "Unnamed zone"
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:178
msgid ""
"Use this option to classify zone traffic by raw, non-<em>uci</em> managed "
"network devices."
msgstr ""
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:177
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:183
msgid ""
"Use this option to classify zone traffic by source or destination subnet "
"instead of networks or devices."
@@ -802,7 +727,7 @@ msgstr "星期三"
msgid "Week Days"
msgstr "星期"
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:103
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:107
msgid "Zone ⇒ Forwardings"
msgstr "區域 ⇒ 轉發"
@@ -812,7 +737,7 @@ msgstr "區域"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:332
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:47
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:119
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:123
msgid "accept"
msgstr "接受"
@@ -861,7 +786,7 @@ msgstr "不跟蹤"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:331
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:46
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:118
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:122
msgid "drop"
msgstr "丟棄"
@@ -894,7 +819,7 @@ msgstr "埠"
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:333
#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:45
-#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:117
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:121
msgid "reject"
msgstr "拒絕"
@@ -903,6 +828,12 @@ msgstr "拒絕"
msgid "second"
msgstr "秒"
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:88
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:173
+#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:265
+msgid "this new zone"
+msgstr ""
+
#: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:197
#: applications/luci-app-firewall/luasrc/tools/firewall.lua:121
msgid "type"
@@ -913,6 +844,45 @@ msgstr "型別"
msgid "types"
msgstr "型別"
+#~ msgid "Add"
+#~ msgstr "新增"
+
+#~ msgid "Add and edit..."
+#~ msgstr "新增並編輯…"
+
+#~ msgid "Do not rewrite"
+#~ msgstr "不重寫"
+
+#~ msgid "External zone"
+#~ msgstr "外部區域"
+
+#~ msgid "New SNAT rule"
+#~ msgstr "新建 SNAT 規則"
+
+#~ msgid "New forward rule"
+#~ msgstr "新建轉發規則"
+
+#~ msgid "New input rule"
+#~ msgstr "新建進入規則"
+
+#~ msgid "New port forward"
+#~ msgstr "新建埠轉發"
+
+#~ msgid "New source NAT"
+#~ msgstr "新建 Source NAT"
+
+#~ msgid "Open ports on router"
+#~ msgstr "開啟路由器埠"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "To source IP"
+#~ msgstr "到源 IP"
+
+#~ msgid "To source port"
+#~ msgstr "到源埠"
+
#~ msgid "Output zone"
#~ msgstr "出站區域"
diff --git a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
index 23f0cf4b40..7df9dac84e 100644
--- a/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/es/mjpg-streamer.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:33-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -130,11 +130,13 @@ msgstr "Control led"
#: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
msgid "Link newest picture to fixed file name"
-msgstr ""
+msgstr "Vincula la imagen más reciente al nombre de archivo fijo"
#: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
msgid "Link the last picture in ringbuffer to fixed named file provided."
msgstr ""
+"Enlace la última imagen en ringbuffer a un archivo con nombre fijo "
+"proporcionado."
#: applications/luci-app-mjpg-streamer/luasrc/controller/mjpg-streamer.lua:12
msgid "MJPG-streamer"
diff --git a/applications/luci-app-mwan3/po/es/mwan3.po b/applications/luci-app-mwan3/po/es/mwan3.po
index 2592a2f681..014a271da8 100644
--- a/applications/luci-app-mwan3/po/es/mwan3.po
+++ b/applications/luci-app-mwan3/po/es/mwan3.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 23:36-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -778,7 +778,7 @@ msgstr "Intervalo de actualización"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:37
msgid "View the content of /etc/protocols for protocol description"
-msgstr "Ver el contenido de /etc/protocol para la descripción del protocolo."
+msgstr "Ver el contenido de /etc/protocol para la descripción del protocolo"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:19
msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!"
@@ -854,7 +854,7 @@ msgstr "agujero negro (caída)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:241
msgid "connected (mwan3)"
-msgstr ""
+msgstr "conectado (mwan3)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:82
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:30
@@ -864,15 +864,15 @@ msgstr "predeterminado (usar tabla de enrutamiento principal)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:242
msgid "disconnected (mwan3)"
-msgstr ""
+msgstr "desconectado (mwan3)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:240
msgid "ifdown (netifd)"
-msgstr ""
+msgstr "Interfaz abajo (netifd)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:239
msgid "ifup (netifd)"
-msgstr ""
+msgstr "Interfaz arriba (netifd)"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:84
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:28
diff --git a/applications/luci-app-ntpc/po/es/ntpc.po b/applications/luci-app-ntpc/po/es/ntpc.po
index bfeeac6e14..f953d8e2ac 100644
--- a/applications/luci-app-ntpc/po/es/ntpc.po
+++ b/applications/luci-app-ntpc/po/es/ntpc.po
@@ -1,21 +1,21 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2012-11-25 11:14+0200\n"
-"Last-Translator: José Vicente <josevteg@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2019-09-17 23:38-0300\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Poedit 2.2.3\n"
+"Language-Team: \n"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:21
msgid "Clock Adjustment"
-msgstr "Ajuste del Reloj"
+msgstr "Configuración del reloj"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:17
msgid "Count of time measurements"
@@ -34,7 +34,7 @@ msgstr "General"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:34
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpcmini.lua:23
msgid "Hostname"
-msgstr "Nombre de la máquina"
+msgstr "Nombre de host"
#: applications/luci-app-ntpc/luasrc/model/cbi/ntpc/ntpc.lua:25
msgid "Offset frequency"
diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
index 11e27d7c00..75463d405c 100644
--- a/applications/luci-app-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua
@@ -379,9 +379,9 @@ function fetch_jsoninfo(otable)
if jsonreq4 ~= "" then
has_v4 = 1
- jsondata4 = json.decode(jsonreq4)
+ jsondata4 = json.decode(jsonreq4) or {}
if otable == 'status' then
- data4 = jsondata4 or {}
+ data4 = jsondata4
else
data4 = jsondata4[otable] or {}
end
@@ -393,9 +393,9 @@ function fetch_jsoninfo(otable)
end
if jsonreq6 ~= "" then
has_v6 = 1
- jsondata6 = json.decode(jsonreq6)
+ jsondata6 = json.decode(jsonreq6) or {}
if otable == 'status' then
- data6 = jsondata6 or {}
+ data6 = jsondata6
else
data6 = jsondata6[otable] or {}
end
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile
index 57a9367e1c..b7d1a79fbc 100644
--- a/applications/luci-app-simple-adblock/Makefile
+++ b/applications/luci-app-simple-adblock/Makefile
@@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
LUCI_PKGARCH:=all
-PKG_RELEASE:=35
+PKG_RELEASE:=37
include ../../luci.mk
diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
index 3ec4c4399f..f4153355d6 100644
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
+++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
@@ -15,13 +15,18 @@ local dispatcher = require "luci.dispatcher"
local enabledFlag = uci:get(packageName, "config", "enabled")
local command, outputFile, outputCache, outputGzip
local targetDNS = uci:get(packageName, "config", "dns")
+local checkDnsmasq = sys.call("which dnsmasq >/dev/null 2>&1") == 0 and true
+local checkUnbound = sys.call("which unbound >/dev/null 2>&1") == 0 and true
+local checkDnsmasqIpset = sys.call("dnsmasq -v 2>/dev/null | grep -q 'no-ipset' || ! dnsmasq -v 2>/dev/null | grep -q -w 'ipset'") ~= 0
+ and sys.call("ipset help hash:net >/dev/null 2>&1") and true
if not targetDNS or targetDNS == "" then
targetDNS = "dnsmasq.servers"
end
if targetDNS ~= "dnsmasq.addnhosts" and targetDNS ~= "dnsmasq.conf" and
- targetDNS ~= "dnsmasq.servers" and targetDNS ~= "unbound.adb_list" then
+ targetDNS ~= "dnsmasq.ipset" and targetDNS ~= "dnsmasq.servers" and
+ targetDNS ~= "unbound.adb_list" then
targetDNS = "dnsmasq.servers"
end
@@ -177,13 +182,34 @@ end
s:tab("advanced", translate("Advanced Configuration"))
-dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), translate("Pick the DNS resolution option to create the adblock list for, see the") .. " "
- .. [[<a href="]] .. readmeURL .. [[#dns-resolution-option" target="_blank">]]
- .. translate("README") .. [[</a>]] .. " " .. translate("for details."))
-dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts"))
-dns:value("dnsmasq.conf", translate("DNSMASQ Config"))
-dns:value("dnsmasq.servers", translate("DNSMASQ Servers File"))
-dns:value("unbound.adb_list", translate("Unbound AdBlock List"))
+local dns_descr = translate("Pick the DNS resolution option to create the adblock list for, see the") .. " "
+ .. [[<a href="]] .. readmeURL .. [[#dns-resolution-option" target="_blank">]]
+ .. translate("README") .. [[</a>]] .. " " .. translate("for details.")
+
+if not checkDnsmasq then
+ dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.addnhosts</i> " .. translate("is not supported on this system.")
+ dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.conf</i> " .. translate("is not supported on this system.")
+ dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.")
+ dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.servers</i> " .. translate("is not supported on this system.")
+elseif not checkDnsmasqIpset then
+ dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.")
+end
+if not checkUnbound then
+ dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>unbound.adb_list</i> " .. translate("is not supported on this system.")
+end
+
+dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), dns_descr)
+if checkDnsmasq then
+ dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts"))
+ dns:value("dnsmasq.conf", translate("DNSMASQ Config"))
+ if checkDnsmasqIpset then
+ dns:value("dnsmasq.ipset", translate("DNSMASQ IP Set"))
+ end
+ dns:value("dnsmasq.servers", translate("DNSMASQ Servers File"))
+end
+if checkUnbound then
+ dns:value("unbound.adb_list", translate("Unbound AdBlock List"))
+end
dns.default = "dnsmasq.servers"
ipv6 = s:taboption("advanced", ListValue, "ipv6_enabled", translate("IPv6 Support"), translate("Add IPv6 entries to block-list."))
@@ -210,11 +236,6 @@ o8:value("0", translate("Do not use simultaneous processing"))
o8:value("1", translate("Use simultaneous processing"))
o8.default = 1
-o9 = s:taboption("advanced", ListValue, "allow_non_ascii", translate("Allow Non-ASCII characters in DNSMASQ file"), translate("Only enable if your version of DNSMASQ supports the use of Non-ASCII characters, otherwise DNSMASQ will fail to start."))
-o9:value("0", translate("Do not allow Non-ASCII"))
-o9:value("1", translate("Allow Non-ASCII"))
-o9.default = "0"
-
o10 = s:taboption("advanced", ListValue, "compressed_cache", translate("Store compressed cache file on router"), translate("Attempt to create a compressed cache of block-list in the persistent memory."))
o10:value("0", translate("Do not store compressed cache"))
o10:value("1", translate("Store compressed cache"))
diff --git a/applications/luci-app-simple-adblock/po/es/simple-adblock.po b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
index 6998d4d64c..502c5e68d5 100644
--- a/applications/luci-app-simple-adblock/po/es/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/es/simple-adblock.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 22:58-0300\n"
+"PO-Revision-Date: 2019-09-17 22:46-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -14,11 +14,11 @@ msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:191
msgid "Add IPv6 entries"
-msgstr ""
+msgstr "Añadir entradas IPv6"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
msgid "Add IPv6 entries to block-list."
-msgstr ""
+msgstr "Añadir entradas IPv6 a la lista de bloqueo."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:178
msgid "Advanced Configuration"
@@ -36,23 +36,22 @@ msgstr "Permitir caracteres no ASCII en el archivo DNSMASQ"
msgid ""
"Attempt to create a compressed cache of block-list in the persistent memory."
msgstr ""
+"Intente crear un caché comprimido de la lista de bloqueo en la memoria "
+"persistente."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:149
msgid "Basic Configuration"
msgstr "Configuración básica"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "URLs de dominio en lista negra"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "Dominios en la lista negra"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "URLs de hosts en lista negra"
@@ -64,33 +63,30 @@ msgstr "Errores recopilados"
msgid "Configuration"
msgstr "Configuración"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Controla el registro del sistema y la salida de consola."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
+"Controla el registro del sistema y la verbosidad de salida de la consola."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
msgid "Curl download retry"
-msgstr ""
+msgstr "Intento de descarga de Curl"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
msgid "DNS Service"
-msgstr ""
+msgstr "Servicio de DNS"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:183
msgid "DNSMASQ Additional Hosts"
-msgstr ""
+msgstr "Hosts adicionales de DNSMASQ"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:184
msgid "DNSMASQ Config"
-msgstr ""
+msgstr "Config de DNSMASQ"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:185
msgid "DNSMASQ Servers File"
-msgstr ""
+msgstr "Archivo de servidores DNSMASQ"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Delay (in seconds) for on-boot start"
@@ -102,7 +98,7 @@ msgstr "Deshabilitar depuración"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:190
msgid "Do not add IPv6 entries"
-msgstr ""
+msgstr "No añadir entradas IPv6"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:214
msgid "Do not allow Non-ASCII"
@@ -131,53 +127,41 @@ msgstr "Habilitar/Iniciar"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
msgid "Enables debug output to /tmp/simple-adblock.log."
-msgstr ""
+msgstr "Habilita la salida de depuración a /tmp/simple-adblock.log."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "Forzar enrutador DNS"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "Forzar el servidor DNS del enrutador a todos los dispositivos locales"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-"Forza el uso del DNS del enrutador en dispositivos locales, también conocido "
-"como Secuestro de DNS"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
+"Fuerza el uso de DNS del enrutador en dispositivos locales, también "
+"conocido como secuestro de DNS."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:189
msgid "IPv6 Support"
-msgstr ""
+msgstr "Soporte de IPv6"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:204
msgid ""
"If curl is installed and detected, it would retry download this many times "
"on timeout/fail."
msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Dominios individuales para ser incluidos en la lista negra"
+"Si curl está instalado y detectado, volvería a intentar descargar esto "
+"muchas veces en tiempo de espera/falla."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Dominios individuales para ser incluidos en la lista blanca"
+msgstr "Dominios individuales para ser incluidos en la lista negra."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
-msgstr ""
+msgstr "Dominios individuales para ser incluidos en la lista blanca."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:94
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:98
@@ -185,7 +169,6 @@ msgid "Info"
msgstr "Info"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED para indicar estado"
@@ -194,9 +177,10 @@ msgid ""
"Launch all lists downloads and processing simultaneously, reducing service "
"start time."
msgstr ""
+"Inicie todas las descargas y el procesamiento de listas simultáneamente, "
+"reduciendo el tiempo de inicio del servicio."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Dejar que los dispositivos locales usen sus propios servidores DNS si están "
@@ -215,22 +199,22 @@ msgstr ""
"ASCII; de lo contrario, DNSMASQ no se iniciará."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "Configuración de verbosidad de salida"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:180
msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
+"Elija la opción de resolución DNS para crear la lista de bloqueos de "
+"anuncios, consulte el"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "Elige el LED que no se haya usado en"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
msgid "README"
-msgstr ""
+msgstr "LÉEME"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:120
msgid "Reload"
@@ -238,7 +222,7 @@ msgstr "Recargar"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:196
msgid "Run service after set delay on boot."
-msgstr ""
+msgstr "Ejecute el servicio después de la demora establecida en el arranque."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:76
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:79
@@ -263,26 +247,22 @@ msgid "Simple AdBlock"
msgstr "Simple AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
-msgstr "Ajustes de Simple AdBlock "
+msgstr "Configuración de Simple AdBlock "
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:208
msgid "Simultaneous processing"
msgstr "Procesamiento simultáneo"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "Alguna salida"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Iniciar el servicio Simple Adblock"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
+"Detenga la descarga si está detenida durante un número determinado de "
+"segundos."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:104
msgid "Stop/Disable"
@@ -297,12 +277,10 @@ msgid "Store compressed cache file on router"
msgstr "Almacene el archivo de caché comprimido en el enrutador"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "Suprimir salida"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "Configuración del sistema LED"
@@ -310,40 +288,27 @@ msgstr "Configuración del sistema LED"
msgid "Task"
msgstr "Tarea"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL a listas de dominios que se incluirán en la lista negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL a listas de dominios que se incluirán en la lista blanca"
+msgstr "URL a listas de dominios que se incluirán en la lista negra."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
-msgstr ""
-
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL a listas de hosts para ser incluidos en la lista negra"
+msgstr "URL a listas de dominios que se incluirán en la lista blanca."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
-msgstr ""
+msgstr "URL a listas de hosts que se incluirán en la lista negra."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:186
msgid "Unbound AdBlock List"
-msgstr ""
+msgstr "Lista de AdBlock Unbound"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:210
msgid "Use simultaneous processing"
msgstr "Usar procesamiento simultáneo"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "Salida verbosa"
@@ -352,24 +317,47 @@ msgid "Whitelist and Blocklist Management"
msgstr "Gestión de listas blancas y listas de bloqueo"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "URLs de dominio en lista blanca"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "Dominios en lista blanca"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
msgid "for details."
-msgstr ""
+msgstr "para detalles."
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "ninguno"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Controla el registro del sistema y la salida de consola."
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forza el uso del DNS del enrutador en dispositivos locales, también "
+#~ "conocido como Secuestro de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Dominios individuales para ser incluidos en la lista negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Dominios individuales para ser incluidos en la lista blanca"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Iniciar el servicio Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "URL a listas de dominios que se incluirán en la lista negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "URL a listas de dominios que se incluirán en la lista blanca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "URL a listas de hosts para ser incluidos en la lista negra"
+
#~ msgid ""
#~ "Attempt to create a compressed cache of final block-list on the router."
#~ msgstr ""
diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
index 38ec1f074c..d6786289d3 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -42,17 +42,14 @@ msgid "Basic Configuration"
msgstr "基本設定"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "ドメイン ブラックリストのURL"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "ブラックリスト ドメイン"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "hosts ブラックリストのURL"
@@ -64,10 +61,6 @@ msgstr ""
msgid "Configuration"
msgstr "設定"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "システム ログとコンソール出力の冗長性を設定します。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -134,21 +127,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "ルーターDNSの強制"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "全ローカル デバイスにルーター DNSサーバーの使用を強制"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、"
-"DNS ハイジャックとしても知られています。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -163,18 +148,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "ブラックリストに登録する、個々のドメインです。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "ホワイトリストに登録する、個々のドメインです。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -185,7 +162,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "ステータスを表示するLED"
@@ -196,7 +172,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr "DNSサーバーの使用を強制しない"
@@ -211,7 +186,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "出力詳細度の設定"
@@ -220,7 +194,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "右の設定で既に使用されていないLEDを選択します"
@@ -259,7 +232,6 @@ msgid "Simple AdBlock"
msgstr "Simple AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "Simple AdBlock 設定"
@@ -268,14 +240,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "軽量出力"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Simple Adblock サービスを開始"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -293,12 +260,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "出力の抑制"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "LED 設定"
@@ -306,26 +271,14 @@ msgstr "LED 設定"
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "ブラックリストに登録するドメインのリストのURLです。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "ホワイトリストに登録するドメインのリストのURLです。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -339,7 +292,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "詳細出力"
@@ -348,12 +300,10 @@ msgid "Whitelist and Blocklist Management"
msgstr "ホワイトリストとブラックリストの管理"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "ドメイン ホワイトリストのURL"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "ホワイトリスト ドメイン"
@@ -362,10 +312,36 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "なし"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "システム ログとコンソール出力の冗長性を設定します。"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これ"
+#~ "は、DNS ハイジャックとしても知られています。"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "ブラックリストに登録する、個々のドメインです。"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "ホワイトリストに登録する、個々のドメインです。"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Simple Adblock サービスを開始"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "ブラックリストに登録するドメインのリストのURLです。"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "ホワイトリストに登録するドメインのリストのURLです。"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr ""
+#~ "ブラックリストに登録するドメインが列挙された、hostsファイルのURLです。"
+
#~ msgid "Enables debug output to /tmp/simple-adblock.log"
#~ msgstr "/tmp/simple-adblock.log へのデバッグ出力を有効にします。"
diff --git a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
index 6b4686167e..1a1fe59021 100644
--- a/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt-br/simple-adblock.po
@@ -41,17 +41,14 @@ msgid "Basic Configuration"
msgstr "Configurações Básicas"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "Endereço com lista de Domínio para a Lista Negra"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "Domínios para a Lista Negra"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "Endereços de Hosts para a Lista Negra"
@@ -63,12 +60,6 @@ msgstr ""
msgid "Configuration"
msgstr "Configuração"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr ""
-"Controla o sistema de registro e o detalhamento das mensagens de saída do "
-"console"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -135,21 +126,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "Forçar o servidor de DNS do Roteador para todos os dispositivos locais"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-"Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
-"como redirecionamento de DNS"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -164,18 +147,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Domínios individuais para serem incluídos na Lista Negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Domínios individuais para serem incluídos na Lista Branca"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -186,7 +161,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED para indicar o estado"
@@ -197,7 +171,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Deixe que os dispositivos locais usem seus próprios servidores de DNS, se "
@@ -214,7 +187,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "Definição do detalhamento do registro"
@@ -223,7 +195,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "Escolha um LED não usando em"
@@ -262,7 +233,6 @@ msgid "Simple AdBlock"
msgstr "Simple AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "Configuração do Simple AdBlock"
@@ -271,14 +241,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "Pouco detalhado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Inicie o serviço Simple Adblock"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -296,12 +261,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "Suprimir"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "Configuração do LED"
@@ -309,26 +272,14 @@ msgstr "Configuração do LED"
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "Endereço da lista dos domínios para a Lista Negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "Endereço da lista dos domínios para a Lista Branca"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "Endereço da lista dos hosts para a Lista Negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -342,7 +293,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "Detalhado"
@@ -351,12 +301,10 @@ msgid "Whitelist and Blocklist Management"
msgstr "Gerenciamento de Listas Branca e Preta"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "Endereço com lista de domínio para a Lista Branca"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "Domínios para a Lista Branca"
@@ -365,10 +313,37 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "nenhum"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr ""
+#~ "Controla o sistema de registro e o detalhamento das mensagens de saída do "
+#~ "console"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
+#~ "como redirecionamento de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Branca"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Inicie o serviço Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Branca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "Endereço da lista dos hosts para a Lista Negra"
+
#~ msgid "Enables debug output to /tmp/simple-adblock.log"
#~ msgstr "Habilitar a saída da depuração para /tmp/simple-adblock.log"
diff --git a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
index 37b645ff1c..7010df158e 100644
--- a/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/pt/simple-adblock.po
@@ -31,17 +31,14 @@ msgid "Basic Configuration"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "Endereço com lista de Domínio para a Lista Negra"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "Domínios para a Lista Negra"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "Endereços de Hosts para a Lista Negra"
@@ -53,12 +50,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr ""
-"Controla o sistema de registro e o detalhamento das mensagens de saída do "
-"console"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -125,21 +116,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "Forçar o DNS do Roteador"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "Forçar o servidor de DNS do Roteador para todos os dispositivos locais"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-"Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
-"como redirecionamento de DNS"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -154,18 +137,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Domínios individuais para serem incluídos na Lista Negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Domínios individuais para serem incluídos na Lista Branca"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -176,7 +151,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED para indicar o estado"
@@ -187,7 +161,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Deixe que os dispositivos locais usem seus próprios servidores de DNS, se "
@@ -204,7 +177,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "Definição do detalhamento do registro"
@@ -213,7 +185,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "Escolha um LED não usando em"
@@ -252,7 +223,6 @@ msgid "Simple AdBlock"
msgstr "Simple AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "Configuração do Simple AdBlock"
@@ -261,14 +231,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "Pouco detalhado"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -286,12 +251,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "Suprimir"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "Configuração do LED"
@@ -299,26 +262,14 @@ msgstr "Configuração do LED"
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "Endereço da lista dos domínios para a Lista Negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "Endereço da lista dos domínios para a Lista Branca"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "Endereço da lista dos hosts para a Lista Negra"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -332,7 +283,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "Detalhado"
@@ -341,12 +291,10 @@ msgid "Whitelist and Blocklist Management"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "Endereço com lista de domínio para a Lista Branca"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "Domínios para a Lista Branca"
@@ -355,9 +303,33 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "Nenhum"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr ""
+#~ "Controla o sistema de registro e o detalhamento das mensagens de saída do "
+#~ "console"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Forçar o uso do DNS do Roteador nos dispositivos locais, também conhecido "
+#~ "como redirecionamento de DNS"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Negra"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Domínios individuais para serem incluídos na Lista Branca"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Negra"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "Endereço da lista dos domínios para a Lista Branca"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "Endereço da lista dos hosts para a Lista Negra"
+
#~ msgid "Enable/start service"
#~ msgstr "Habilitar/Iniciar o serviço"
diff --git a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
index 51dc9a7be6..9bca395f9c 100644
--- a/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ru/simple-adblock.po
@@ -45,17 +45,14 @@ msgid "Basic Configuration"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "URL ссылки Черных<br />списков доменов"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "Черный список доменов"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "URL ссылки Черных<br />списков хостов"
@@ -67,10 +64,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Детальная настройка записи событий в системный журнал."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -137,20 +130,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "Назначить DNS роутера"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "Назначить DNS роутера всем локальным устройствам"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-"Назначить DNS роутера всем локальным устройствам, методом DNS Hijacking."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -165,18 +151,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Домены добавленные пользователем в Черный список."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Домены добавленные пользователем в Белый список."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -187,7 +165,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED индикация состояния"
@@ -198,7 +175,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr ""
"Разрешить локальным устройствам использовать собственные DNS, если они "
@@ -215,7 +191,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "Настройка журнала"
@@ -224,7 +199,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "Выберите LED не используется на странице"
@@ -263,7 +237,6 @@ msgid "Simple AdBlock"
msgstr "Simple AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "Simple AdBlock настройки"
@@ -272,14 +245,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "Частичная запись"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "Запуск сервиса Simple Adblock"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -297,12 +265,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "Запретить запись"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "'Настройка LED индикации' системы."
@@ -310,26 +276,14 @@ msgstr "'Настройка LED индикации' системы."
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "URL ссылки Черных списков доменов."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "URL ссылки Белых списков доменов."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "URL ссылки Черных списков хостов."
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -343,7 +297,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "Подробная запись"
@@ -352,12 +305,10 @@ msgid "Whitelist and Blocklist Management"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "URL ссылки Белых списков доменов"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "Белый список доменов"
@@ -366,6 +317,30 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "ничего"
+
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Детальная настройка записи событий в системный журнал."
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr ""
+#~ "Назначить DNS роутера всем локальным устройствам, методом DNS Hijacking."
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Домены добавленные пользователем в Черный список."
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Домены добавленные пользователем в Белый список."
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "Запуск сервиса Simple Adblock"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "URL ссылки Черных списков доменов."
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "URL ссылки Белых списков доменов."
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "URL ссылки Черных списков хостов."
diff --git a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
index 7456703d30..9891a6fc05 100644
--- a/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/sv/simple-adblock.po
@@ -31,17 +31,14 @@ msgid "Basic Configuration"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "Svartlistade domänadresser"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "Svartlistade domäner"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "Svartlistade värdadresser"
@@ -53,10 +50,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -123,19 +116,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -150,18 +137,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "Individuella domäner som ska svartlistas"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "Individulla domäner som ska svartlistas"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -172,7 +151,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED för att indikera status"
@@ -183,7 +161,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr ""
@@ -198,7 +175,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr ""
@@ -207,7 +183,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr ""
@@ -246,7 +221,6 @@ msgid "Simple AdBlock"
msgstr "Simple AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "Inställningar för Simple AdBlock"
@@ -255,14 +229,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "Viss utmatning"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -280,12 +249,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "Förträng utmatning"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr ""
@@ -293,26 +260,14 @@ msgstr ""
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -326,7 +281,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "Utförlig utmatning"
@@ -335,12 +289,10 @@ msgid "Whitelist and Blocklist Management"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "Vitlistade domänadresser"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "Vitlistade domäner"
@@ -349,9 +301,17 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "ingen"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "Kontrollerar systemloggar och detaljnivån för konsoll-utmatningen"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "Individuella domäner som ska svartlistas"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "Individulla domäner som ska svartlistas"
+
#~ msgid "Enable/start service"
#~ msgstr "Aktivera/starta tjänsten"
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index bfe042bf98..723fbb0cfc 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -31,17 +31,14 @@ msgid "Basic Configuration"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr ""
@@ -53,10 +50,6 @@ msgstr ""
msgid "Configuration"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -123,19 +116,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -150,18 +137,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -172,7 +151,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr ""
@@ -183,7 +161,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr ""
@@ -198,7 +175,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr ""
@@ -207,7 +183,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr ""
@@ -246,7 +221,6 @@ msgid "Simple AdBlock"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr ""
@@ -255,14 +229,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -280,12 +249,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr ""
@@ -293,26 +260,14 @@ msgstr ""
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr ""
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -326,7 +281,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr ""
@@ -335,12 +289,10 @@ msgid "Whitelist and Blocklist Management"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr ""
@@ -349,6 +301,5 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr ""
diff --git a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
index c7ae170f18..eb98866e06 100644
--- a/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po
@@ -41,17 +41,14 @@ msgid "Basic Configuration"
msgstr "基本配置"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "列入黑名单的域名 URL"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "列入黑名单的域名"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "列入黑名单的主机 URL"
@@ -63,10 +60,6 @@ msgstr ""
msgid "Configuration"
msgstr "配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "控制系统日志和控制台输出的详细程度"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -133,19 +126,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "强制路由器 DNS"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "强制路由器 DNS 服务所有本地设备"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "强制路由器 DNS 在本地设备上使用,也称为 DNS 劫持"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -160,18 +147,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "要列入黑名单的单独域名"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "要列入白名单的单独域名"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -182,7 +161,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED 指示状态"
@@ -193,7 +171,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr "如果设置,让本地设备使用自己的 DNS 服务器"
@@ -208,7 +185,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "输出详细程度设置"
@@ -217,7 +193,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "选择尚未使用的 LED"
@@ -256,7 +231,6 @@ msgid "Simple AdBlock"
msgstr "简单 AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "简单 AdBlock 设置"
@@ -265,14 +239,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "一些输出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "启动简单 Adblock 服务"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -290,12 +259,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "抑制输出"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "系统 LED 配置"
@@ -303,26 +270,14 @@ msgstr "系统 LED 配置"
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "黑名单域名列表的 URL"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "白名单域名列表的 URL"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "黑名单主机列表的 URL"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -336,7 +291,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "详细输出"
@@ -345,12 +299,10 @@ msgid "Whitelist and Blocklist Management"
msgstr "白名单和黑名单管理"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "白名单域名 URL"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "白名单域名"
@@ -359,10 +311,33 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "无"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "控制系统日志和控制台输出的详细程度"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr "强制路由器 DNS 在本地设备上使用,也称为 DNS 劫持"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "要列入黑名单的单独域名"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "要列入白名单的单独域名"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "启动简单 Adblock 服务"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "黑名单域名列表的 URL"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "白名单域名列表的 URL"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "黑名单主机列表的 URL"
+
#~ msgid "Enables debug output to /tmp/simple-adblock.log"
#~ msgstr "启用到 /tmp/simple-adblock.log 的调试输出"
diff --git a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
index d34359c773..c64b994f90 100644
--- a/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po
@@ -41,17 +41,14 @@ msgid "Basic Configuration"
msgstr "基本配置"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
msgid "Blacklisted Domain URLs"
msgstr "列入黑名單的域名 URL"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
msgid "Blacklisted Domains"
msgstr "列入黑名單的域名"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
msgid "Blacklisted Hosts URLs"
msgstr "列入黑名單的主機 URL"
@@ -63,10 +60,6 @@ msgstr ""
msgid "Configuration"
msgstr "配置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
-msgid "Controls system log and console output verbosity"
-msgstr "控制系統日誌和控制檯輸出的詳細程度"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
msgid "Controls system log and console output verbosity."
msgstr ""
@@ -133,19 +126,13 @@ msgid "Enables debug output to /tmp/simple-adblock.log."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
msgid "Force Router DNS"
msgstr "強制路由器 DNS"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:159
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:23
msgid "Force Router DNS server to all local devices"
msgstr "強制路由器 DNS 服務所有本地裝置"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:21
-msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "強制路由器 DNS 在本地裝置上使用,也稱為 DNS 劫持"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:157
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr ""
@@ -160,18 +147,10 @@ msgid ""
"on timeout/fail."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:50
-msgid "Individual domains to be blacklisted"
-msgstr "要列入黑名單的單獨域名"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:236
msgid "Individual domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
-msgid "Individual domains to be whitelisted"
-msgstr "要列入白名單的單獨域名"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
msgid "Individual domains to be whitelisted."
msgstr ""
@@ -182,7 +161,6 @@ msgid "Info"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "LED to indicate status"
msgstr "LED 指示狀態"
@@ -193,7 +171,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:158
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:22
msgid "Let local devices use their own DNS servers if set"
msgstr "如果設定,讓本地裝置使用自己的 DNS 伺服器"
@@ -208,7 +185,6 @@ msgid ""
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:151
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:14
msgid "Output Verbosity Setting"
msgstr "輸出詳細程度設定"
@@ -217,7 +193,6 @@ msgid "Pick the DNS resolution option to create the adblock list for, see the"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:168
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:33
msgid "Pick the LED not already used in"
msgstr "選擇尚未使用的 LED"
@@ -256,7 +231,6 @@ msgid "Simple AdBlock"
msgstr "簡單 AdBlock"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:46
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:1
msgid "Simple AdBlock Settings"
msgstr "簡單 AdBlock 設定"
@@ -265,14 +239,9 @@ msgid "Simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:153
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:16
msgid "Some output"
msgstr "一些輸出"
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
-msgid "Start Simple Adblock service"
-msgstr "啟動簡單 Adblock 服務"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:200
msgid "Stop the download if it is stalled for set number of seconds."
msgstr ""
@@ -290,12 +259,10 @@ msgid "Store compressed cache file on router"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:152
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:15
msgid "Suppress output"
msgstr "抑制輸出"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:170
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:35
msgid "System LED Configuration"
msgstr "系統 LED 配置"
@@ -303,26 +270,14 @@ msgstr "系統 LED 配置"
msgid "Task"
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:60
-msgid "URLs to lists of domains to be blacklisted"
-msgstr "黑名單域名列表的 URL"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:246
msgid "URLs to lists of domains to be blacklisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
-msgid "URLs to lists of domains to be whitelisted"
-msgstr "白名單域名列表的 URL"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
msgid "URLs to lists of domains to be whitelisted."
msgstr ""
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:65
-msgid "URLs to lists of hosts to be blacklisted"
-msgstr "黑名單主機列表的 URL"
-
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:251
msgid "URLs to lists of hosts to be blacklisted."
msgstr ""
@@ -336,7 +291,6 @@ msgid "Use simultaneous processing"
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:154
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:17
msgid "Verbose output"
msgstr "詳細輸出"
@@ -345,12 +299,10 @@ msgid "Whitelist and Blocklist Management"
msgstr "白名單和黑名單管理"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:241
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:55
msgid "Whitelisted Domain URLs"
msgstr "白名單域名 URL"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:231
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:45
msgid "Whitelisted Domains"
msgstr "白名單域名"
@@ -359,10 +311,33 @@ msgid "for details."
msgstr ""
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:37
msgid "none"
msgstr "無"
+#~ msgid "Controls system log and console output verbosity"
+#~ msgstr "控制系統日誌和控制檯輸出的詳細程度"
+
+#~ msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
+#~ msgstr "強制路由器 DNS 在本地裝置上使用,也稱為 DNS 劫持"
+
+#~ msgid "Individual domains to be blacklisted"
+#~ msgstr "要列入黑名單的單獨域名"
+
+#~ msgid "Individual domains to be whitelisted"
+#~ msgstr "要列入白名單的單獨域名"
+
+#~ msgid "Start Simple Adblock service"
+#~ msgstr "啟動簡單 Adblock 服務"
+
+#~ msgid "URLs to lists of domains to be blacklisted"
+#~ msgstr "黑名單域名列表的 URL"
+
+#~ msgid "URLs to lists of domains to be whitelisted"
+#~ msgstr "白名單域名列表的 URL"
+
+#~ msgid "URLs to lists of hosts to be blacklisted"
+#~ msgstr "黑名單主機列表的 URL"
+
#~ msgid "Enables debug output to /tmp/simple-adblock.log"
#~ msgstr "啟用到 /tmp/simple-adblock.log 的除錯輸出"
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
index ee3fd254fb..56af1cc96a 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/cpu.lua
@@ -12,4 +12,25 @@ s = m:section( NamedSection, "collectd_cpu", "luci_statistics" )
enable = s:option( Flag, "enable", translate("Enable this plugin") )
enable.default = 0
+-- collectd_cpu.reportbycpu (ReportByCpu)
+reportbycpu = s:option( Flag, "ReportByCpu",
+ translate("Report by CPU"),
+ translate("By setting this, CPU is not aggregate of all processors on the system"))
+reportbycpu.default = 1
+reportbycpu:depends( "enable", 1 )
+
+-- collectd_cpu.reportbystate (ReportByState)
+reportbystate = s:option( Flag, "ReportByState",
+ translate("Report by state"),
+ translate("When set to true, reports per-state metric (system, user, idle)"))
+reportbystate.default = 1
+reportbystate:depends( "enable", 1 )
+
+-- collectd_cpu.valuespercentage (ValuesPercentage)
+valuespercentage = s:option( Flag, "ValuesPercentage",
+ translate("Report in percent"),
+ translate("When set to true, we request percentage values"))
+valuespercentage.default = 0
+valuespercentage:depends({ enable = 1, ReportByCpu = 1, ReportByState = 1 })
+
return m
diff --git a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
index fa677b8d12..e5f3360c05 100644
--- a/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
+++ b/applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/memory.lua
@@ -10,4 +10,18 @@ s = m:section( NamedSection, "collectd_memory", "luci_statistics" )
enable = s:option( Flag, "enable", translate("Enable this plugin") )
enable.default = 0
+-- collectd_memory.valuesabsolute (ValuesAbsolute)
+valuespercentage = s:option( Flag, "ValuesAbsolute",
+ translate("Absolute values"),
+ translate("When set to true, we request absolute values"))
+valuespercentage.default = 1
+valuespercentage:depends( "enable", 1 )
+
+-- collectd_memory.valuespercentage (ValuesPercentage)
+valuespercentage = s:option( Flag, "ValuesPercentage",
+ translate("Percent values"),
+ translate("When set to true, we request percentage values"))
+valuespercentage.default = 0
+valuespercentage:depends( "enable", 1 )
+
return m
diff --git a/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
index 004a450eec..bae325990e 100644
--- a/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/plugins/cpu.lua
@@ -1,7 +1,7 @@
return {
legend = {
{ },
- { },
+ { "ValuesPercentage" , "ReportByCpu", "ReportByState" },
{ }
},
label = _("Processor"),
diff --git a/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua b/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
index 8dee2dafcd..9ad1b3f88d 100644
--- a/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/plugins/memory.lua
@@ -1,7 +1,7 @@
return {
- legend = {
- { },
+ legend = {
{ },
+ { "ValuesPercentage", "ValuesAbsolute" },
{ }
},
label = _("Memory"),
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
index 226c84ee96..3f8910722a 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/cpu.lua
@@ -3,33 +3,167 @@
module("luci.statistics.rrdtool.definitions.cpu",package.seeall)
+local uci = require("luci.model.uci").cursor()
+local reportbystate = uci:get("luci_statistics", "collectd_cpu", "ReportByState") or "0"
+
function item()
return luci.i18n.translate("Processor")
end
function rrdargs( graph, plugin, plugin_instance, dtype )
+ local p = {}
+
+ local title = "%H: Processor usage"
+ if #plugin_instance > 0 then
+ title = "%H: Processor usage on core #%pi"
+ end
+
+ if reportbystate == "1" then
+ local cpu = {
+ title = title,
+ y_min = "0",
+ alt_autoscale_max = true,
+ vlabel = "Jiffies",
+ number_format = "%5.1lf",
+ data = {
+ instances = {
+ cpu = {
+ "idle",
+ "interrupt",
+ "nice",
+ "softirq",
+ "steal",
+ "system",
+ "user",
+ "wait"
+ }
+ },
+ options = {
+ cpu_idle = {
+ color = "ffffff",
+ title = "Idle"
+ },
+ cpu_interrupt = {
+ color = "a000a0",
+ title = "Interrupt"
+ },
+ cpu_nice = {
+ color = "00e000",
+ title = "Nice"
+ },
+ cpu_softirq = {
+ color = "ff00ff",
+ title = "Softirq"
+ },
+ cpu_steal = {
+ color = "000000",
+ title = "Steal"
+ },
+ cpu_system = {
+ color = "ff0000",
+ title = "System"
+ },
+ cpu_user = {
+ color = "0000ff",
+ title = "User"
+ },
+ cpu_wait = {
+ color = "ffb000",
+ title = "Wait"
+ }
+ }
+ }
+ }
- return {
- title = "%H: Processor usage on core #%pi",
- y_min = "0",
- alt_autoscale_max = true,
- vlabel = "Percent",
- number_format = "%5.1lf%%",
- data = {
- instances = {
- cpu = { "user", "nice", "system", "softirq", "interrupt" }
- },
-
- options = {
- cpu_idle = { color = "ffffff", title = "Idle" },
- cpu_nice = { color = "00e000", title = "Nice" },
- cpu_user = { color = "0000ff", title = "User" },
- cpu_wait = { color = "ffb000", title = "Wait" },
- cpu_system = { color = "ff0000", title = "System" },
- cpu_softirq = { color = "ff00ff", title = "Softirq" },
- cpu_interrupt = { color = "a000a0", title = "Interrupt" },
- cpu_steal = { color = "000000", title = "Steal" }
+ local percent = {
+ title = title,
+ y_min = "0",
+ alt_autoscale_max = true,
+ vlabel = "Percent",
+ number_format = "%5.1lf%%",
+ data = {
+ instances = {
+ percent = {
+ "idle",
+ "interrupt",
+ "nice",
+ "softirq",
+ "steal",
+ "system",
+ "user",
+ "wait"
+ }
+ },
+ options = {
+ percent_idle = {
+ color = "ffffff",
+ title = "Idle"
+ },
+ percent_interrupt = {
+ color = "a000a0",
+ title = "Interrupt"
+ },
+ percent_nice = {
+ color = "00e000",
+ title = "Nice"
+ },
+ percent_softirq = {
+ color = "ff00ff",
+ title = "Softirq"
+ },
+ percent_steal = {
+ color = "000000",
+ title = "Steal"
+ },
+ percent_system = {
+ color = "ff0000",
+ title = "System"
+ },
+ percent_user = {
+ color = "0000ff",
+ title = "User"
+ },
+ percent_wait = {
+ color = "ffb000",
+ title = "Wait"
+ }
+ }
}
}
- }
+
+ local types = graph.tree:data_types( plugin, plugin_instance )
+
+ for _, t in ipairs(types) do
+ if t == "cpu" then
+ p[#p+1] = cpu
+ end
+
+ if t == "percent" then
+ p[#p+1] = percent
+ end
+ end
+ else
+ p = {
+ title = title,
+ y_min = "0",
+ alt_autoscale_max = true,
+ vlabel = "Percent",
+ number_format = "%5.1lf%%",
+ data = {
+ instances = {
+ percent = {
+ "active",
+ }
+ },
+ options = {
+ percent_active = {
+ color = "00e000",
+ title = "Active"
+ }
+ }
+ }
+ }
+ end
+
+ return p
end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
index 7218bfd441..68a4ecf625 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/iptables.lua
@@ -13,8 +13,8 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
{
title = "%H: Firewall: Processed bytes in %pi",
vlabel = "Bytes/s",
- number_format = "%5.0lf%sB/s",
- totals_format = "%5.0lf%sB",
+ number_format = "%5.1lf%sB/s",
+ totals_format = "%5.1lf%sB",
data = {
types = { "ipt_bytes" },
options = {
@@ -30,7 +30,7 @@ function rrdargs( graph, plugin, plugin_instance, dtype )
title = "%H: Firewall: Processed packets in %pi",
vlabel = "Packets/s",
number_format = "%5.1lf P/s",
- totals_format = "%5.0lf%s",
+ totals_format = "%5.1lf%s",
data = {
types = { "ipt_packets" },
options = {
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
index b05d31dc02..749c3e352c 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/memory.lua
@@ -1,13 +1,5 @@
---[[
-
-(c) 2011 Manuel Munz <freifunk at somakoma dot de>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-]]--
+-- Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
+-- Licensed to the public under the Apache License 2.0.
module("luci.statistics.rrdtool.definitions.memory",package.seeall)
@@ -16,24 +8,92 @@ function item()
end
function rrdargs( graph, plugin, plugin_instance, dtype )
+ local p = {}
- return {
+ local memory = {
title = "%H: Memory usage",
vlabel = "MB",
number_format = "%5.1lf%s",
y_min = "0",
alt_autoscale_max = true,
data = {
- instances = {
- memory = { "free", "buffered", "cached", "used" }
+ instances = {
+ memory = {
+ "free",
+ "buffered",
+ "cached",
+ "used"
+ }
},
options = {
- memory_buffered = { color = "0000ff", title = "Buffered" },
- memory_cached = { color = "ff00ff", title = "Cached" },
- memory_used = { color = "ff0000", title = "Used" },
- memory_free = { color = "00ff00", title = "Free" }
+ memory_buffered = {
+ color = "0000ff",
+ title = "Buffered"
+ },
+ memory_cached = {
+ color = "ff00ff",
+ title = "Cached"
+ },
+ memory_used = {
+ color = "ff0000",
+ title = "Used"
+ },
+ memory_free = {
+ color = "00ff00",
+ title = "Free"
+ }
}
}
}
+
+ local percent = {
+ title = "%H: Memory usage",
+ vlabel = "Percent",
+ number_format = "%5.1lf%%",
+ y_min = "0",
+ alt_autoscale_max = true,
+ data = {
+ instances = {
+ percent = {
+ "free",
+ "buffered",
+ "cached",
+ "used"
+ }
+ },
+ options = {
+ percent_buffered = {
+ color = "0000ff",
+ title = "Buffered"
+ },
+ percent_cached = {
+ color = "ff00ff",
+ title = "Cached"
+ },
+ percent_used = {
+ color = "ff0000",
+ title = "Used"
+ },
+ percent_free = {
+ color = "00ff00",
+ title = "Free"
+ }
+ }
+ }
+ }
+
+ local types = graph.tree:data_types( plugin, plugin_instance )
+
+ for _, t in ipairs(types) do
+ if t == "percent" then
+ p[#p+1] = percent
+ end
+
+ if t == "memory" then
+ p[#p+1] = memory
+ end
+ end
+
+ return p
end
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
index e290af549a..b8d11c0759 100644
--- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
+++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/definitions/ping.lua
@@ -9,25 +9,62 @@ end
function rrdargs( graph, plugin, plugin_instance, dtype )
- return {
- -- Ping roundtrip time
- { title = "%H: ICMP Round Trip Time",
- vlabel = "ms",
- number_format = "%5.1lf ms",
- data = {
- sources = { ping = { "value" } },
- options = { ping__value = {
- noarea = true, overlay = true, title = "%di" } }
- } },
+ local ping = {
+ title = "%H: ICMP Round Trip Time",
+ vlabel = "ms",
+ number_format = "%5.1lf ms",
+ data = {
+ sources = {
+ ping = {
+ "value"
+ }
+ },
+ options = {
+ ping__value = {
+ noarea = true,
+ overlay = true,
+ title = "%di"
+ }
+ }
+ }
+ }
+
+ local droprate = {
+ title = "%H: ICMP Drop Rate",
+ vlabel = "%",
+ number_format = "%5.2lf %%",
+ data = {
+ types = {
+ "ping_droprate"
+ },
+ options = {
+ ping_droprate = {
+ noarea = true,
+ overlay = true,
+ title = "%di",
+ transform_rpn = "100,*"
+ }
+ }
+ }
+ }
- -- Ping droprate
- { title = "%H: ICMP Drop Rate",
- vlabel = "%",
- number_format = "%5.2lf %%",
- data = {
- types = { "ping_droprate" },
- options = { ping_droprate = {
- noarea = true, overlay = true, title = "%di", transform_rpn = "100,*" } }
- } }
+ local stddev = {
+ title = "%H: ICMP Standard Deviation",
+ vlabel = "ms",
+ number_format = "%5.1lf ms",
+ data = {
+ types = {
+ "ping_stddev"
+ },
+ options = {
+ ping_stddev = {
+ noarea = true,
+ overlay = true,
+ title = "%di"
+ }
+ }
+ }
}
+
+ return { ping, droprate, stddev }
end
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index e8580daac7..c0c873d76c 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -140,13 +140,18 @@ end
local login_section = (m.hidden.ssid or "") .. (m.hidden.bssid or "")
login_section = login_section:gsub("[^%w_]", "_")
local cmd = uci:get("travelmate", login_section, "command")
+local cmd_args_default = uci:get("travelmate", login_section, "command_args")
cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
translate("External script reference which will be called for automated captive portal logins."))
-cmd_list:value("none")
+cmd_args = m:field(Value, "cmdargs", translate("Optional Arguments"),
+ translate("Space separated list of additional optional arguments passed to the Auto Login Script, i.e. username and password"))
for _, z in ipairs(scripts) do
cmd_list:value(z)
+ cmd_args:depends("cmdlist", z)
end
+cmd_list:value("none")
cmd_list.default = cmd or "none"
+cmd_args.default = cmd_args_default
function wssid.write(self, section, value)
newsection = uci:section("wireless", "wifi-iface", nil, {
@@ -194,6 +199,7 @@ function wssid.write(self, section, value)
end
if uci:get("travelmate", login_section) then
uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
+ uci:set("travelmate", login_section, "command_args", cmd_args:formvalue(section))
uci:save("travelmate")
uci:commit("travelmate")
end
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index cd2fa69ae4..ab0b924549 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -133,13 +133,18 @@ if s ~= nil then
local login_section = (s.ssid or "") .. (s.bssid or "")
login_section = login_section:gsub("[^%w_]", "_")
local cmd = uci:get("travelmate", login_section, "command")
+ local cmd_args_default = uci:get("travelmate", login_section, "command_args")
cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
translate("External script reference which will be called for automated captive portal logins."))
- cmd_list:value("none")
+ cmd_args = m:field(Value, "cmdargs", translate("Optional Arguments"),
+ translate("Space separated list of additional optional arguments passed to the Auto Login Script, i.e. username and password"))
for _, z in ipairs(scripts) do
cmd_list:value(z)
+ cmd_args:depends("cmdlist", z)
end
+ cmd_list:value("none")
cmd_list.default = cmd or "none"
+ cmd_args.default = cmd_args_default
else
m.on_cancel()
end
@@ -181,6 +186,7 @@ function wssid.write(self, section, value)
end
if uci:get("travelmate", login_section) then
uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
+ uci:set("travelmate", login_section, "command_args", cmd_args:formvalue(section))
uci:save("travelmate")
uci:commit("travelmate")
end
diff --git a/applications/luci-app-travelmate/po/es/travelmate.po b/applications/luci-app-travelmate/po/es/travelmate.po
index cbb83d9b9f..47203c079a 100644
--- a/applications/luci-app-travelmate/po/es/travelmate.po
+++ b/applications/luci-app-travelmate/po/es/travelmate.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 23:10-0300\n"
+"PO-Revision-Date: 2019-09-17 22:49-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +23,7 @@ msgstr "Acción"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
msgid "Add Open Uplinks"
-msgstr ""
+msgstr "Añadir enlaces ascendentes abiertos"
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
@@ -52,7 +52,7 @@ msgstr "Autenticación"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:143
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:136
msgid "Auto Login Script"
-msgstr ""
+msgstr "Script de inicio de sesión automático"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:72
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:89
@@ -66,6 +66,8 @@ msgid ""
"Automatically add open uplinks like hotel captive portals to your wireless "
"config."
msgstr ""
+"Agregue automáticamente enlaces ascendentes abiertos como portales cautivos "
+"de hotel a su configuración inalámbrica."
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:112
msgid ""
@@ -184,7 +186,7 @@ msgstr "Editar este enlace"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:54
msgid "Enable Travelmate"
-msgstr "Habilitar Travelmate"
+msgstr "Habilitar"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:103
msgid "Enable Verbose Debug Logging"
@@ -207,6 +209,8 @@ msgid ""
"External script reference which will be called for automated captive portal "
"logins."
msgstr ""
+"Referencia de script externo que se llamará para inicios de sesión cautivos "
+"automatizados del portal."
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Extra Options"
@@ -251,7 +255,7 @@ msgstr "Forzar TKIP"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:79
msgid "Force TKIP and CCMP (AES)"
-msgstr "Forzar TKIP and CCMP (AES)"
+msgstr "Forzar TKIP y CCMP (AES)"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
msgid ""
diff --git a/applications/luci-app-udpxy/po/es/udpxy.po b/applications/luci-app-udpxy/po/es/udpxy.po
new file mode 100644
index 0000000000..3be3187acb
--- /dev/null
+++ b/applications/luci-app-udpxy/po/es/udpxy.po
@@ -0,0 +1,81 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2019-08-02 12:43-0300\n"
+"PO-Revision-Date: 2019-09-23 16:44-0300\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: es\n"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:23
+msgid "Bind IP/Interface"
+msgstr "Enlace IP/interfaz"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:47
+msgid "Buffer messages"
+msgstr "Mensajes de búfer"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:43
+msgid "Buffer size"
+msgstr "Tamaño del búfer"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:51
+msgid "Buffer time"
+msgstr "Tiempo del búfer"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:10
+msgid "Enabled"
+msgstr "Habilitado"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:39
+msgid "Log file"
+msgstr "Archivo de registro"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:35
+msgid "Max clients"
+msgstr "Máx. clientes"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:59
+msgid "Multicast subscription renew"
+msgstr "Renovación de suscripción de multidifusión"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:55
+msgid "Nice increment"
+msgstr "Incremento agradable"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:27
+msgid "Port"
+msgstr "Puerto"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:15
+msgid "Respawn"
+msgstr "Reaparecer"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:31
+msgid "Source IP/Interface"
+msgstr "IP de origen/interfaz"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:21
+msgid "Status"
+msgstr "Estado"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:18
+msgid "Verbose"
+msgstr "Verbosidad"
+
+#: applications/luci-app-udpxy/luasrc/controller/udpxy.lua:11
+msgid "udpxy"
+msgstr "udpxy"
+
+#: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:4
+msgid ""
+"udpxy is a UDP-to-HTTP multicast traffic relay daemon, here you can "
+"configure the settings."
+msgstr ""
+"udpxy es un demonio de retransmisión de tráfico de multidifusión "
+"UDP a HTTP, aquí puede configurar los ajustes."
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
index 60d0477d53..d1ea774085 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
@@ -17,6 +17,8 @@ local ht = require "luci.http"
local ds = require "luci.dispatcher"
local ucl = luci.model.uci.cursor()
local valman = ucl:get_first("unbound", "unbound", "manual_conf")
+local dhcplk = ucl:get_first("unbound", "unbound", "dhcp_link")
+local lstrig = ucl:get_first("dhcp", "odhcpd", "leasetrigger")
m1 = Map("unbound")
s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
@@ -29,6 +31,12 @@ s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
s1.addremove = false
s1.anonymous = true
+if (valman == "0") and (dhcplk == "odhcpd") and (lstrig ~= "/usr/lib/unbound/odhcpd.sh") then
+ m1.message = translatef( "Note: local DNS is configured to look at odhpcd, "
+ .. "but odhpcd UCI lease trigger is incorrectly set: ")
+ .. "dhcp.odhcpd.leasetrigger='" .. lstrig .. "'"
+end
+
--LuCI, Unbound, or Not
s1:tab("basic", translate("Basic"))
diff --git a/applications/luci-app-vpnbypass/po/de/vpnbypass.po b/applications/luci-app-vpnbypass/po/de/vpnbypass.po
index 635d9987cb..a686c32383 100644
--- a/applications/luci-app-vpnbypass/po/de/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/de/vpnbypass.po
@@ -1,20 +1,24 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Zu umgehende Domains"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
"Domains die direkt erreicht werden sollen (außerhalb des VPN Tunnel), siehe"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Zu umgehende lokale IP Adressen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
@@ -22,23 +26,23 @@ msgstr ""
"Lokale IP Adressen, oder Subnetze mit direktem Internet-Zugriff (außerhalb "
"des VPN Tunnel)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Zu umgehende Lokale Ports"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Lokale Ports um VPN Bypass anzustoßen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Zu umgehende entfernte IP Adressen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -46,26 +50,46 @@ msgstr ""
"Entfernte IP Adressen, oder Subnetze mit direktem Internet-Zugriff "
"(außerhalb des VPN Tunnel)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Zu umgehende entfernte Ports"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Enfernte Ports um VPN Bypass anzustßen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Starte VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr ""
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "VPN Bypass Einstellungen"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "für Syntax"
+
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Starte VPNBypass service"
diff --git a/applications/luci-app-vpnbypass/po/es/vpnbypass.po b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
index 9fdbcacb5b..ad077f0b7f 100644
--- a/applications/luci-app-vpnbypass/po/es/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/es/vpnbypass.po
@@ -3,30 +3,34 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:51-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamin@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Dominios a omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
"Dominios a los que se puede acceder directamente (fuera del túnel VPN), "
"consulte"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr "Habilitar/Iniciar"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Direcciones IP locales para omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
@@ -34,23 +38,23 @@ msgstr ""
"Direcciones IP o subredes locales con acceso directo a Internet (fuera del "
"túnel VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Puertos locales para evitar"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Puertos locales para activar VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "LÉEME"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Direcciones IP remotas para omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -58,26 +62,46 @@ msgstr ""
"Direcciones IP remotas o subredes a las que se accederá directamente (fuera "
"del túnel VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Puertos remotos para omitir"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Puertos remotos para activar VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Iniciar el servicio VPNBypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr "Estado del servicio"
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr "El servicio está deshabilitado/detenido"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr "El servicio está habilitado/iniciado"
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr "Detener/Deshabilitar"
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN Bypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr "Reglas de VPN Bypass"
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "Configuración de VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "para la sintaxis"
+
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Iniciar el servicio VPNBypass"
diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
index da254e53bd..ba4cc890a9 100644
--- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
@@ -12,42 +12,46 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Domínios para evitar a VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "Domínios para serem acessados diretamente (fora do túnel VPN), veja"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Endereço IP Local para Contornar"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr ""
"Endereço IP Local ou subrede com acesso direto à internet (fora do túnel VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Portas locais para evitar a VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Portas locais para disparar o VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "LEIAME"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Endereço IP Remoto para Contornar"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -55,30 +59,50 @@ msgstr ""
"Endereço IP Remoto ou subrede que serão acessados diretamente (fora do túnel "
"VPN)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Portas remotas para evitar a VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Portas remotas para disparar o VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "Inicie o serviço VPNBypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN Bypass"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "Configurações do VPN Bypass"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "para sintaxe"
+#~ msgid "Start VPNBypass service"
+#~ msgstr "Inicie o serviço VPNBypass"
+
#~ msgid "Enable VPN Bypass"
#~ msgstr "Habilitar o VPN Bypass"
diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
index e924cfe50a..eca6fec324 100644
--- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
@@ -15,19 +15,23 @@ msgstr ""
"Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
"интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "Домены, для<br />обхода блокировки"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "Домены должны быть доступны напрямую (вне VPN-туннеля), см."
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "Локальный IP-адрес<br />обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
@@ -35,23 +39,23 @@ msgstr ""
"Локальные IP-адреса или подсети с прямым доступом в интернет (вне VPN-"
"туннеля)."
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "Локальные порты для запуска обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "Локальные порты<br />для обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "Описание"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "Удаленные IP-адреса<br />обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
@@ -59,27 +63,44 @@ msgstr ""
"Удаленные IP-адреса или подсети, которые будут доступны напрямую (вне "
"туннеля VPN)."
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "Удаленные порты<br />для обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "Удаленные порты для запуска обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "Обход VPN"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "Настройка обхода VPN"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "для синтаксиса"
diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
index 7a9b05327d..06b01d4053 100644
--- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
+++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
@@ -1,66 +1,87 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr ""
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr ""
diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
index 3003cf3827..a986ee2416 100644
--- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
@@ -11,69 +11,93 @@ msgstr ""
"PO-Revision-Date: 2018-08-07 20:19+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "要绕过的域"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "要直接访问的域(不使用 VPN 隧道),请参见"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "要绕过的本地 IP 地址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr "直接访问的本地 IP 地址或子网(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "要绕过的本地端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "触发 VPN 绕过的本地端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "README"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "要绕过的远程 IP 地址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
msgstr "将直接访问的远程 IP 地址或子网(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "要绕过的远程端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "触发 VPN 绕过的远程端口"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
-msgstr "启动 VPNBypass 服务"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN 绕过"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "VPN 绕过设置"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "对于语法"
+#~ msgid "Start VPNBypass service"
+#~ msgstr "启动 VPNBypass 服务"
+
#~ msgid "Enable/start service"
#~ msgstr "启用/启动服务"
diff --git a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
index 1d43363fca..971d5e4ede 100644
--- a/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-tw/vpnbypass.po
@@ -11,67 +11,88 @@ msgstr ""
"PO-Revision-Date: 2017-10-29 15:30+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:48
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:70
msgid "Domains to Bypass"
msgstr "要繞過的域"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:49
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "要直接訪問的域(不使用 VPN 隧道),請參見"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:14
+msgid "Enable/Start"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid "Local IP Addresses to Bypass"
msgstr "要繞過的本地 IP 位址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53
msgid ""
"Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)"
msgstr "直接訪問的本地 IP 位址或子網(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local Ports to Bypass"
msgstr "要繞過的本地埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:39
msgid "Local ports to trigger VPN Bypass"
msgstr "觸發 VPN 繞過的本地埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "README"
msgstr "README"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "Remote IP Addresses to Bypass"
msgstr "要繞過的遠端 IP 位址"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)"
msgstr "將直接訪問的遠端 IP 位址或子網(不使用 VPN 隧道)"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote Ports to Bypass"
msgstr "要繞過的遠端埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46
msgid "Remote ports to trigger VPN Bypass"
msgstr "觸發 VPN 繞過的遠端埠"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:7
-msgid "Start VPNBypass service"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:5
+msgid "Service Status"
msgstr ""
-#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:6
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:13
+msgid "Service is disabled/stopped"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:17
+msgid "Service is enabled/started"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:18
+msgid "Stop/Disable"
+msgstr ""
+
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
+#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
msgid "VPN Bypass"
msgstr "VPN 繞過"
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
+msgid "VPN Bypass Rules"
+msgstr ""
+
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:3
msgid "VPN Bypass Settings"
msgstr "VPN 繞過設定"
-#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:51
+#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:73
msgid "for syntax"
msgstr "對於語法"
diff --git a/applications/luci-app-wifischedule/po/es/wifischedule.po b/applications/luci-app-wifischedule/po/es/wifischedule.po
index 03e0fccd0c..5aeb5eb7d5 100644
--- a/applications/luci-app-wifischedule/po/es/wifischedule.po
+++ b/applications/luci-app-wifischedule/po/es/wifischedule.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
+"PO-Revision-Date: 2019-09-17 22:54-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: \n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language: es\n"
@@ -139,7 +139,7 @@ msgstr "Miércoles"
#: applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua:26
#: applications/luci-app-wifischedule/luasrc/model/cbi/wifischedule/wifi_schedule.lua:39
msgid "Wifi Schedule"
-msgstr "Programar WiFi"
+msgstr "Horario de WiFi"
#: applications/luci-app-wifischedule/luasrc/controller/wifischedule/wifi_schedule.lua:35
msgid "Wifi Schedule Logfile"
diff --git a/applications/luci-app-wireguard/po/es/wireguard.po b/applications/luci-app-wireguard/po/es/wireguard.po
index e1ef4c6611..7a7ccaf6a6 100644
--- a/applications/luci-app-wireguard/po/es/wireguard.po
+++ b/applications/luci-app-wireguard/po/es/wireguard.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-08-01 21:49-0300\n"
+"PO-Revision-Date: 2019-09-17 22:55-0300\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -55,7 +55,7 @@ msgstr "Último Handshake"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:125
msgid "Listen Port"
-msgstr "Escuchar puerto"
+msgstr "Puerto"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
msgid "Never"