summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po153
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po159
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po153
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po153
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po153
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot153
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po246
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po246
-rw-r--r--applications/luci-app-ahcp/po/zh-cn/ahcp.po2
-rw-r--r--applications/luci-app-ahcp/po/zh-tw/ahcp.po2
-rw-r--r--applications/luci-app-banip/luasrc/controller/banip.lua6
-rw-r--r--applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua168
-rw-r--r--applications/luci-app-banip/luasrc/view/banip/runtime.htm10
-rw-r--r--applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua2
-rwxr-xr-xapplications/luci-app-ddns/luasrc/tools/ddns.lua4
-rw-r--r--applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua4
-rw-r--r--applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po56
-rw-r--r--applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po56
-rw-r--r--applications/luci-app-mwan3/po/zh-cn/mwan3.po28
-rw-r--r--applications/luci-app-mwan3/po/zh-tw/mwan3.po58
-rw-r--r--applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua27
-rw-r--r--applications/luci-app-nft-qos/po/zh-cn/nft-qos.po60
-rw-r--r--applications/luci-app-nft-qos/po/zh-tw/nft-qos.po244
-rw-r--r--applications/luci-app-nut/po/en/nut.po603
-rw-r--r--applications/luci-app-nut/po/templates/nut.pot588
-rw-r--r--applications/luci-app-nut/po/zh-cn/nut.po602
-rw-r--r--applications/luci-app-nut/po/zh-tw/nut.po602
-rw-r--r--applications/luci-app-olsr/po/zh-cn/olsr.po67
-rw-r--r--applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js5
-rw-r--r--applications/luci-app-opkg/po/pl/opkg.po83
-rw-r--r--applications/luci-app-privoxy/po/zh-cn/privoxy.po120
-rw-r--r--applications/luci-app-privoxy/po/zh-tw/privoxy.po615
-rw-r--r--applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua2
-rw-r--r--applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po101
-rw-r--r--applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot91
-rw-r--r--applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua4
-rw-r--r--applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua4
-rw-r--r--applications/luci-app-simple-adblock/po/zh-cn/simple-adblock.po2
-rw-r--r--applications/luci-app-simple-adblock/po/zh-tw/simple-adblock.po2
-rw-r--r--applications/luci-app-statistics/po/zh-cn/statistics.po16
-rw-r--r--applications/luci-app-statistics/po/zh-tw/statistics.po16
-rw-r--r--applications/luci-app-travelmate/po/zh-cn/travelmate.po95
-rw-r--r--applications/luci-app-travelmate/po/zh-tw/travelmate.po98
-rw-r--r--applications/luci-app-uhttpd/po/en/uhttpd.po265
-rw-r--r--applications/luci-app-unbound/luasrc/controller/unbound.lua30
-rw-r--r--applications/luci-app-unbound/po/zh-cn/unbound.po740
-rw-r--r--applications/luci-app-unbound/po/zh-tw/unbound.po740
-rw-r--r--applications/luci-app-wireguard/po/zh-cn/wireguard.po8
-rw-r--r--applications/luci-app-wireguard/po/zh-tw/wireguard.po10
-rwxr-xr-xbuild/i18n-add-language.sh37
-rw-r--r--documentation/CBI.md2
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/cbi.js4
-rw-r--r--modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua9
-rw-r--r--modules/luci-base/po/pl/base.po134
-rw-r--r--modules/luci-base/po/zh-cn/base.po38
-rw-r--r--modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua2
-rw-r--r--modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm13
-rw-r--r--modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm25
-rw-r--r--modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm14
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js2
-rw-r--r--modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua4
-rw-r--r--themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css335
-rw-r--r--themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js1
-rwxr-xr-xthemes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js48
-rwxr-xr-xthemes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm4
-rw-r--r--themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm5
66 files changed, 6979 insertions, 1350 deletions
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 49d42cf564..40e27c4f3f 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -11,11 +11,11 @@ msgstr ""
"X-Generator: Poedit 2.0.3\n"
"Language: it\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -27,7 +27,7 @@ msgid "Action"
msgstr ""
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "Adblock"
@@ -39,7 +39,7 @@ msgstr "Status Adblock"
msgid "Adblock Version"
msgstr "Versione Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Tempo addizionale in secondi di attesa prima che adblock si avvii."
@@ -52,15 +52,15 @@ msgstr "Avanzato"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "Directory del Backup"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr ""
@@ -77,7 +77,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "Fonti lista di Blocco"
@@ -85,13 +85,13 @@ msgstr "Fonti lista di Blocco"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -108,7 +108,7 @@ msgstr ""
msgid "Collecting data..."
msgstr "Raccogliendo dati..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
@@ -124,18 +124,18 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "Directory DNS"
@@ -148,11 +148,11 @@ msgstr ""
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "Descrizione"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -167,7 +167,7 @@ msgstr ""
msgid "Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr ""
@@ -187,38 +187,38 @@ msgstr "Modifica Configurazione"
msgid "Edit Whitelist"
msgstr "Modifica Lista Bianca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Attiva Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "Attiva Backup Lista di Blocco"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Abilita il registro dettagliato in caso di qualsiasi errore di processo."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "Abilitato"
@@ -226,43 +226,43 @@ msgstr "Abilitato"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "Opzioni Extra"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "Forza DNS Locale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr "Forza Ordinamento Globale"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -282,18 +282,18 @@ msgstr "Ultimo Avvio"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
@@ -307,11 +307,11 @@ msgstr "Caricando"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr ""
@@ -320,11 +320,11 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "No"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -355,11 +355,11 @@ msgid "Please edit this file directly in a terminal session."
msgstr ""
"Per favore modifica questo file direttamente in una sessione al terminale."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -371,13 +371,13 @@ msgstr "Interrogazione"
msgid "Query domains"
msgstr "Interrogazione domini"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -398,32 +398,38 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -434,7 +440,7 @@ msgstr "Riprendi"
msgid "Runtime Information"
msgstr "Informazione di Runtime"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "Ric. SSL"
@@ -444,29 +450,34 @@ msgstr "Ric. SSL"
msgid "Save"
msgstr "Salva"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "Innesco d'Avvio"
@@ -480,19 +491,19 @@ msgstr "Sospendi"
msgid "Suspend / Resume Adblock"
msgstr "Sospendi / Riprendi Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
@@ -506,7 +517,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -541,7 +556,7 @@ msgstr ""
msgid "Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -557,11 +572,11 @@ msgstr ""
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr "Ritardo Innesco"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr "Registro di Debug Dettagliato"
@@ -573,21 +588,21 @@ msgstr "Aspettando che il comando venga completato..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "Sì"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index a956d63869..a9eb968e67 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -11,11 +11,11 @@ msgstr ""
"X-Generator: Poedit 2.2\n"
"Language: ja\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr "'Jail' ブロックリストã®ä½œæˆ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -29,7 +29,7 @@ msgid "Action"
msgstr "アクション"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "Adblock"
@@ -41,7 +41,7 @@ msgstr "Adblock ステータス"
msgid "Adblock Version"
msgstr "Adblock ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Adblock ã®å‡¦ç†ãŒé–‹å§‹ã•ã‚Œã‚‹ã¾ã§ã®ã€è¿½åŠ ã®é…延時間(秒)ã§ã™ã€‚"
@@ -54,15 +54,15 @@ msgstr "詳細設定"
msgid "Answer"
msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr "アーカイブ カテゴリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—å…ˆ ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— モード"
@@ -79,7 +79,7 @@ msgstr "ブロックã•ã‚ŒãŸ DNS クエリ"
msgid "Blocked Domain"
msgstr "ブロックã•ã‚ŒãŸãƒ‰ãƒ¡ã‚¤ãƒ³"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "ブロックリストæ供元"
@@ -87,7 +87,7 @@ msgstr "ブロックリストæ供元"
msgid "Blocklist not found!"
msgstr "ブロックリストãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -95,7 +95,7 @@ msgstr ""
"ホワイトリストã«åˆ—挙ã•ã‚ŒãŸã‚‚ã®ã‚’除ãå…¨ã¦ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’ブロックã™ã‚‹ã€è¿½åŠ ã® "
"'Jail' リスト (/tmp/adb_list.jail) を作æˆã—ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -113,7 +113,7 @@ msgstr "クライアント"
msgid "Collecting data..."
msgstr "データåŽé›†ä¸­ã§ã™..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
@@ -129,7 +129,7 @@ msgstr ""
msgid "Count"
msgstr "カウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
@@ -138,12 +138,12 @@ msgstr ""
"ロードãŒã‚¨ãƒ©ãƒ¼ã®å ´åˆã€ã¾ãŸã¯ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ— モードã§ã‚µãƒ¼ãƒ“スを起動ã—ãŸå ´åˆã«ä½¿ç”¨"
"ã•ã‚Œã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ï¼ˆDNS ディレクトリ)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "DNS ディレクトリ"
@@ -156,11 +156,11 @@ msgstr "DNS クエリ レãƒãƒ¼ãƒˆ"
msgid "Date"
msgstr "日付"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "説明"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -175,7 +175,7 @@ msgstr ""
msgid "Domain"
msgstr "ドメイン"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "ダウンロード ユーティリティ"
@@ -195,27 +195,27 @@ msgstr "設定ã®ç·¨é›†"
msgid "Edit Whitelist"
msgstr "ホワイトリストã®ç·¨é›†"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr "メール通知"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr "メール通知カウント"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Adblock ã®æœ‰åŠ¹åŒ–"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "ブロックリスト ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®æœ‰åŠ¹åŒ–"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
msgstr "DNS クエリ レãƒãƒ¼ãƒˆã®æœ‰åŠ¹åŒ–"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
@@ -223,12 +223,12 @@ msgstr ""
"メモリー容é‡ã®å°‘ãªã„デãƒã‚¤ã‚¹ï¼ˆRAM 空ã領域 64MB 未満)ã«ãŠã„ã¦ã€ä¸€æ™‚ファイル"
"内ã®å…¨ä½“çš„ãªã‚½ãƒ¼ãƒˆåŠã³é‡è¤‡ã®é™¤åŽ»ã‚’有効ã«ã—ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"何らã‹ã®å‡¦ç†ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸå ´åˆã«ã€è©³ç´°ãªãƒ‡ãƒãƒƒã‚° ログを有効ã«ã—ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "有効"
@@ -236,19 +236,19 @@ msgstr "有効"
msgid "End Date"
msgstr "終了日"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "拡張オプション"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "DNS キャッシュã®ã‚¯ãƒªã‚¢"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr "Adblock 処ç†ã®å¾Œã« DNS キャッシュをクリアã—ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
@@ -256,7 +256,7 @@ msgstr ""
"詳細ãªæƒ…報㯠<a href=\"%s\" target=\"_blank\">オンライン ドキュメント</a> ã‚’"
"確èªã—ã¦ãã ã•ã„。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -264,19 +264,19 @@ msgstr ""
"パフォーマンスã®æ›´ãªã‚‹æ”¹å–„ã®ãŸã‚ã€å®‰å…¨ã¨æ€ã‚れる '8' ã‚„ '16' ãªã©ã®å€¤ã«å¼•ã上"
"ã’ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "ローカル DNS ã®å¼·åˆ¶"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr "全体ソートã®å¼·åˆ¶"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "ホワイトリスト ファイルã¸ã®ãƒ•ãƒ«ãƒ‘スã§ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -298,7 +298,7 @@ msgstr "最終実行"
msgid "Latest DNS Queries"
msgstr "最新㮠DNS クエリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -306,14 +306,14 @@ msgstr ""
"利用å¯èƒ½ãªãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェースã®ä¸€è¦§ã§ã™ã€‚通常ã€ã‚¹ã‚¿ãƒ¼ãƒˆã‚¢ãƒƒãƒ—㯠"
"'wan' インターフェースã«ã‚ˆã£ã¦ãƒˆãƒªã‚¬ã•ã‚Œã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
"サãƒãƒ¼ãƒˆã•ã‚Œã‚‹ DNS ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã¨ã€ãã‚Œãžã‚Œã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒªã‚¹ãƒˆå‡ºåŠ›å…ˆã®ä¸€è¦§ã§"
"ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã€ã‹ã¤è¨­å®šæ¸ˆã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ ユーティリティã®ä¸€è¦§ã§ã™ã€‚"
@@ -327,11 +327,11 @@ msgstr "読込中"
msgid "Logfile"
msgstr "ログファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr "低優先度サービス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr "ダウンロード キューã®ä¸Šé™"
@@ -340,11 +340,11 @@ msgstr "ダウンロード キューã®ä¸Šé™"
msgid "Name / IP-Address"
msgstr "åå‰ / IP アドレス"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "ã„ã„ãˆ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "デフォルト設定ãŒé©åˆ‡ã§ãªã„å ´åˆã€è¿½åŠ ã§è¨­å®šã™ã‚‹ãŸã‚ã®ã‚ªãƒ—ションã§ã™ã€‚"
@@ -373,13 +373,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "ターミナル セッションã§ç›´æŽ¥ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’編集ã—ã¦ãã ã•ã„。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
"注æ„: ã“ã‚Œã¯æ‰‹å‹•ã§ã® 'msmtp' パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¨ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å¿…è¦ã¨ã—"
"ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
"注æ„: ã“ã‚Œã¯æ‰‹å‹•ã§ã® 'tcpdump-mini' パッケージã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’å¿…è¦ã¨ã—ã¾ã™ã€‚"
@@ -392,7 +392,7 @@ msgstr "検索"
msgid "Query domains"
msgstr "ドメインã®æ¤œç´¢"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -400,7 +400,7 @@ msgstr ""
"メール通知を行ã†ãƒ¡ãƒ¼ãƒ«é€šçŸ¥ã‚«ã‚¦ãƒ³ãƒˆã®ä¸‹é™å€¤ã‚’設定ã—ã¾ã™ã€‚全体カウントãŒæŒ‡å®šã•"
"ã‚ŒãŸå€¤ä»¥ä¸‹ã®å ´åˆã€ãƒ¡ãƒ¼ãƒ«ã‚’å—ã‘å–ã‚Šã¾ã™ï¼ˆè¦å®šå€¤: 0)。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -423,35 +423,41 @@ msgstr "ブロックリストæ供元ã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥"
msgid "Refresh Report"
msgstr "レãƒãƒ¼ãƒˆã‚’リフレッシュ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
msgstr "レãƒãƒ¼ãƒˆ ãƒãƒ£ãƒ³ã‚¯ã‚«ã‚¦ãƒ³ãƒˆ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
msgstr "レãƒãƒ¼ãƒˆ ãƒãƒ£ãƒ³ã‚¯ã‚µã‚¤ã‚º"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
msgstr "レãƒãƒ¼ãƒˆ ディレクトリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
msgstr "レãƒãƒ¼ãƒˆ インターフェース"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
+msgstr "レãƒãƒ¼ãƒˆå¾…ã¡å—ã‘ãƒãƒ¼ãƒˆ"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
msgstr "tcpdump ã«ã‚ˆã‚Šä½¿ç”¨ã•ã‚Œã‚‹ã€ãƒ¬ãƒãƒ¼ãƒˆãƒãƒ£ãƒ³ã‚¯æ•°ã§ã™ã€‚(è¦å®šå€¤: '5')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr "tcpdump ã«ã‚ˆã‚Šä½¿ç”¨ã•ã‚Œã‚‹ã€ãƒ¬ãƒãƒ¼ãƒˆ ãƒãƒ£ãƒ³ã‚¯ã‚µã‚¤ã‚ºã§ã™ã€‚(è¦å®šå€¤: '1')"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
-"tcpdump ã«ã‚ˆã‚Šä½¿ç”¨ã•ã‚Œã‚‹ã€ãƒ¬ãƒãƒ¼ãƒˆã‚’è¡Œã†ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã§ã™ã€‚(è¦å®šå€¤: 'br-"
-"lan')"
+"tcpdump ã«ã‚ˆã‚Šä½¿ç”¨ã•ã‚Œã‚‹ã€ãƒ¬ãƒãƒ¼ãƒˆã‚’è¡Œã†ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã§ã™ã€‚複数ã®ã‚¤ãƒ³ã‚¿ãƒ¼"
+"フェースを使用ã™ã‚‹ã«ã¯ã€ 'any' を設定ã—ã¦ãã ã•ã„。(è¦å®šå€¤: 'br-lan')"
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
msgid "Resume"
@@ -461,7 +467,7 @@ msgstr "å†é–‹"
msgid "Runtime Information"
msgstr "実行情報"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "SSL å¿…é ˆ"
@@ -471,14 +477,14 @@ msgstr "SSL å¿…é ˆ"
msgid "Save"
msgstr "ä¿å­˜"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
"処ç†ã‚¨ãƒ©ãƒ¼ã¾ãŸã¯ãƒ‰ãƒ¡ã‚¤ãƒ³ カウント㌠0 以下ã®å ´åˆã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
@@ -486,7 +492,7 @@ msgstr ""
"nice値(優先度)を '低優先度' ã«è¨­å®šã—ã€adblock ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å‡¦ç†ã®ã‚·ã‚¹ãƒ†"
"ムリソース使用é‡ã‚’抑制ã—ã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
@@ -494,11 +500,18 @@ msgstr ""
"ダウンロードã®åˆ¶å¾¡ã¨ãƒªã‚¹ãƒˆã®å‡¦ç†ã‚’åŒæ™‚並行的ã«è¡Œã†ã€ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ã‚­ãƒ¥ãƒ¼ã®ã‚µã‚¤"
"ズã§ã™ã€‚(è¦å®šå€¤: '8')"
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
+msgstr ""
+"tcpdump ã«ã‚ˆã‚Šä½¿ç”¨ã•ã‚Œã‚‹ã€ãƒ¬ãƒãƒ¼ãƒˆã‚’è¡Œã†ãƒãƒ¼ãƒˆã®ã‚¹ãƒšãƒ¼ã‚¹ã§åŒºåˆ‡ã‚‰ã‚ŒãŸãƒªã‚¹ãƒˆã§"
+"ã™ã€‚(è¦å®šå€¤: '53')"
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
msgstr "開始日"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "スタートアップ トリガ"
@@ -512,7 +525,7 @@ msgstr "一時åœæ­¢"
msgid "Suspend / Resume Adblock"
msgstr "Adblock ã®ä¸€æ™‚åœæ­¢ / å†é–‹"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
@@ -520,7 +533,7 @@ msgstr ""
"adblock ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã®ä¿å­˜å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚ä¸æ®ç™ºæ€§ãƒ‡ã‚£ã‚¹ã‚¯ã®ã¿ã‚’使用ã—ã¦"
"ãã ã•ã„。(例: 外部 USB スティック)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
@@ -528,7 +541,7 @@ msgstr ""
"DNS 関連レãƒãƒ¼ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã®ä¿å­˜å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚å¯èƒ½ã§ã‚ã‚Œã°ä¸æ®ç™ºæ€§ãƒ‡ã‚£ã‚¹"
"クを使用ã—ã¦ãã ã•ã„。(例: 外部 USB スティック)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生æˆã•ã‚ŒãŸãƒ–ロックリスト 'adb_list.overall' ã®ä¿å­˜å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
@@ -544,7 +557,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Adblock ã«é–¢é€£ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã¿ãŒæŠ½å‡ºã•ã‚ŒãŸã€ã‚·ã‚¹ãƒ†ãƒ ãƒ­ã‚°å‡ºåŠ›ã§ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "ã“ã®å¤‰æ›´ã®å映ã«ã¯ã€æ‰‹å‹•ã§ã®ã‚µãƒ¼ãƒ“スã®åœæ­¢ / å†èµ·å‹•ãŒå¿…è¦ã§ã™ã€‚"
@@ -583,7 +600,7 @@ msgstr ""
msgid "Time"
msgstr "時刻"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -599,11 +616,11 @@ msgstr "ä¸Šä½ 10 レãƒãƒ¼ãƒˆ"
msgid "Total DNS Queries"
msgstr "ç· DNS クエリ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr "トリガé…延"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr "詳細ãªãƒ‡ãƒãƒƒã‚° ログ"
@@ -615,15 +632,15 @@ msgstr "コマンド実行中ã§ã™..."
msgid "Whitelist"
msgstr "ホワイトリスト"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr "ホワイトリスト ファイル"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "ã¯ã„"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
@@ -631,7 +648,7 @@ msgstr ""
"ã“ã®åˆ¶ç´„ã®åŽ³ã—ã„ブロックリストをã€ã‚²ã‚¹ãƒˆ WiFi ã‚„å­ä¾›ã®å®‰å…¨ã‚’守る設定ãªã©ã«æ‰‹"
"å‹•ã§åˆ©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 1146dd7164..43c8b1c4a1 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -12,11 +12,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr "'Enjaule' Criação de Lista Negra"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -30,7 +30,7 @@ msgid "Action"
msgstr ""
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "Adblock"
@@ -42,7 +42,7 @@ msgstr "Estado do Adblock"
msgid "Adblock Version"
msgstr "Versão do Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
"Atraso de gatilho adicional em segundos antes do processamento do adblock "
@@ -57,15 +57,15 @@ msgstr "Avançado"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr "Categorias Arquivadas"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "Diretório da cópia de segurança"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr "Modo de Backup"
@@ -82,7 +82,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "Fontes de listas de bloqueio"
@@ -90,7 +90,7 @@ msgstr "Fontes de listas de bloqueio"
msgid "Blocklist not found!"
msgstr "Lista preta não encontrada!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -98,7 +98,7 @@ msgstr ""
"Cria uma lista adicional (/tmp/adb_list.jail) para bloquear o acesso a todos "
"os domínios exceto aqueles listados na lista branca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -116,7 +116,7 @@ msgstr ""
msgid "Collecting data..."
msgstr "Coletando dados..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
@@ -132,7 +132,7 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
@@ -141,12 +141,12 @@ msgstr ""
"usadas em caso de falha ao baixar novas listas ou ao iniciar em modo de "
"backup."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "Serviço DNS (Diretório DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "Diretório DNS"
@@ -159,11 +159,11 @@ msgstr ""
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "Descrição"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -178,7 +178,7 @@ msgstr ""
msgid "Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "Ferramenta para Baixar"
@@ -198,27 +198,27 @@ msgstr "Editar Configuração"
msgid "Edit Whitelist"
msgstr "Editar Lista Permitida"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr "Notificação por Email"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr "Quantidade para Notificação por Email"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Habilitar adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "Habilitar cópia de segurança da lista de bloqueio"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
@@ -226,13 +226,13 @@ msgstr ""
"Habilita a remoção de entradas duplicadas em dispositivos com pouca memória "
"(&lt; 64 MB de memória RAM livre)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
"Habilita os registros de depuração detalhados em caso de qualquer erro de "
"processamento."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "Habilitado"
@@ -240,19 +240,19 @@ msgstr "Habilitado"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "Opções adicionais"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "Limpar cache DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr "Limpar cache DNS depois do processamento do adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
@@ -260,7 +260,7 @@ msgstr ""
"Para mais informações <a href=\"%s\" target=\"_blank\">veja a documentação "
"externa</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -268,19 +268,19 @@ msgstr ""
"Para melhoramentos no desempenho, você pode aumentar este valor (ex: '8' ou "
"'16' deve ser seguro)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "Force o DNS local"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr "Force Tipo Geral"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "Caminho completo para a lista branca."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -300,7 +300,7 @@ msgstr "Última Execução"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
@@ -308,14 +308,14 @@ msgstr ""
"Lista das interfaces de redes disponíveis. Normalmente, o início será "
"desencadeado pela interface 'wan'."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
"Lista dos serviços DNS suportados com seu diretório padrão de exportação de "
"lista."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr "Lista de ferramentas suportadas para baixar listas."
@@ -329,11 +329,11 @@ msgstr "Carregando"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr "Serviço de Baixa Prioridade"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr "Tamanho Máximo da Fila"
@@ -342,11 +342,11 @@ msgstr "Tamanho Máximo da Fila"
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "Não"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -377,11 +377,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Por favor edite esse arquivo direto em uma sessão de terminal."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -393,7 +393,7 @@ msgstr "Consulta"
msgid "Query domains"
msgstr "Consulta de domínios"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -401,7 +401,7 @@ msgstr ""
"Aumente a quantidade mínima para notificar por email para receber mensagens "
"se a contagem total for menos ou igual a este limite (padrão 0)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -424,32 +424,38 @@ msgstr "Atualizar as Fontes de Lista Negra"
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -460,7 +466,7 @@ msgstr "Continuar"
msgid "Runtime Information"
msgstr "Informação de execução"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "Req. de SSL"
@@ -470,7 +476,7 @@ msgstr "Req. de SSL"
msgid "Save"
msgstr "Salvar"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
@@ -478,7 +484,7 @@ msgstr ""
"Enviar notificações por email se ocorrer um erro de processamento ou se a "
"contagem por domínio for menor que 0."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
@@ -486,17 +492,22 @@ msgstr ""
"Define o nível de prioridade para 'baixa', reduzindo o impacto do "
"processamento em segundo plano do adblock no seu sistema."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "Gatilho de Iniciação"
@@ -510,19 +521,19 @@ msgstr "Suspender"
msgid "Suspend / Resume Adblock"
msgstr "Suspender / Resumir adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Diretório para a lista nega gerada 'adb_list.overall'."
@@ -537,7 +548,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "Mensagens do syslog relacionadas ao adblock."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "Esta mudança requer um reinício manual do serviço para ser efetivada."
@@ -572,7 +587,7 @@ msgstr ""
msgid "Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -588,11 +603,11 @@ msgstr ""
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr "Atraso no gatilho"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr "Registros de Depuração Detalhados"
@@ -604,21 +619,21 @@ msgstr "Aguardando por comando para completar..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr "Lista Branca"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "Sim"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index 3aed4fe7b9..58febecfc7 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -15,11 +15,11 @@ msgstr ""
"Project-Info: Это техничеÑкий перевод, не доÑловный. Главное-удобный руÑÑкий "
"интерфейÑ, вÑе проверÑлоÑÑŒ в графичеÑком режиме, ÑовмеÑтим Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ apps\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr "Создание Черного<br />ÑпиÑка 'Jail'"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -33,7 +33,7 @@ msgid "Action"
msgstr ""
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "AdBlock"
@@ -45,7 +45,7 @@ msgstr "СоÑтоÑние Adblock"
msgid "Adblock Version"
msgstr "ВерÑÐ¸Ñ Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ° в Ñекундах до начала работы Adblock."
@@ -58,15 +58,15 @@ msgstr "Дополнительно"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "Папка Ð´Ð»Ñ Ð±Ñкапа"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr "Режим ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð±ÐµÐºÐ°Ð¿Ð°"
@@ -83,7 +83,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "ИÑточники ÑпиÑков блокировок"
@@ -91,13 +91,13 @@ msgstr "ИÑточники ÑпиÑков блокировок"
msgid "Blocklist not found!"
msgstr "СпиÑок блокировок не найден!"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -115,7 +115,7 @@ msgstr ""
msgid "Collecting data..."
msgstr "Сбор данных..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
@@ -131,7 +131,7 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
@@ -139,12 +139,12 @@ msgstr ""
"Создание Ñжатых резервных копий ÑпиÑков блокировок, они будут иÑпользоватьÑÑ "
"в Ñлучае ошибок загрузки или при запуÑке в ручном режиме."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS бÑкенд (папка DNS)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "Папка DNS"
@@ -157,11 +157,11 @@ msgstr ""
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "ОпиÑание"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -176,7 +176,7 @@ msgstr ""
msgid "Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "Утилита Ð´Ð»Ñ ÑкачиваниÑ"
@@ -196,27 +196,27 @@ msgstr "Редактировать config файл"
msgid "Edit Whitelist"
msgstr "Редактировать Белый ÑпиÑок"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr "Email уведомлениÑ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr "Кол-во email уведомлений"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Включить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "БÑкап ÑпиÑка блокировок"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
@@ -225,11 +225,11 @@ msgstr ""
"уÑтройÑтвах Ñ Ð½Ð¸Ð·ÐºÐ¸Ð¼ объемом памÑти (&lt; 64 MB Ñвободной оперативной "
"памÑти)."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr "Включить подробное ведение журнала отладки в Ñлучае ошибок обработки."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "Включено"
@@ -237,19 +237,19 @@ msgstr "Включено"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "Дополнительные наÑтройки"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "ОчиÑтка кÑша DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr "ОчиÑтка DNS-кÑша поÑле обработки Adblock-ом."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
@@ -257,7 +257,7 @@ msgstr ""
"<br />Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации <a href=\"%s\" target=\"_blank"
"\"> Ñмотрите онлайн документацию</a>."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
@@ -265,19 +265,19 @@ msgstr ""
"Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñти вы можете увеличить Ñто "
"значение, например Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ '8' или '16' должны быть безопаÑными."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "Локальный DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ð¾Ð»Ð½Ð°Ñ Ñортировка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "Полный путь к файлу Белого ÑпиÑка."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -297,18 +297,18 @@ msgstr "ПоÑледний запуÑк"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
"СпиÑок поддерживаемых и полноÑтью предварительно наÑтроенных утилит Ð´Ð»Ñ "
@@ -324,11 +324,11 @@ msgstr "Загрузка"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ñ‡ÐµÑ€ÐµÐ´ÑŒ загрузки"
@@ -337,11 +337,11 @@ msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ñ‡ÐµÑ€ÐµÐ´ÑŒ загрузки"
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "Ðет"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -371,11 +371,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Редактируйте данный файл только в терминале."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -387,13 +387,13 @@ msgstr "ЗапроÑ"
msgid "Query domains"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -414,32 +414,38 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -450,7 +456,7 @@ msgstr "Возобновить"
msgid "Runtime Information"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ ÑоÑтоÑнии"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ SSL"
@@ -460,29 +466,34 @@ msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ SSL"
msgid "Save"
msgstr "Сохранить"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "Триггер запуÑка"
@@ -496,19 +507,19 @@ msgstr "ПриоÑтановить"
msgid "Suspend / Resume Adblock"
msgstr "ПриоÑтановить / Возобновить Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Папка Ð´Ð»Ñ Ñозданного ÑпиÑка блокировки 'adb_list.overall'."
@@ -524,7 +535,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -559,7 +574,7 @@ msgstr ""
msgid "Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -575,11 +590,11 @@ msgstr ""
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr "Задержка запуÑка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr "Подробный журнал отладки"
@@ -591,21 +606,21 @@ msgstr "Ожидание Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr "Файл Белого ÑпиÑка"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "Да"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 6a934a2394..90c12c7114 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -1,11 +1,11 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -17,7 +17,7 @@ msgid "Action"
msgstr ""
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "Adblock"
@@ -29,7 +29,7 @@ msgstr "Status för Adblock"
msgid "Adblock Version"
msgstr "Version av Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
@@ -42,15 +42,15 @@ msgstr "Avancerat"
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "Säkerhetskopiera mapp"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr ""
@@ -67,7 +67,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "Källor för blockeringslistor"
@@ -75,13 +75,13 @@ msgstr "Källor för blockeringslistor"
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -99,7 +99,7 @@ msgstr ""
msgid "Collecting data..."
msgstr "Samlar in data..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
@@ -115,18 +115,18 @@ msgstr ""
msgid "Count"
msgstr "Räkna"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS-bakände (DNS-mapp)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "DNS-mapp"
@@ -139,11 +139,11 @@ msgstr ""
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "Beskrivning"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -158,7 +158,7 @@ msgstr ""
msgid "Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr ""
@@ -178,37 +178,37 @@ msgstr "Redigerar konfigurationen"
msgid "Edit Whitelist"
msgstr "Redigera vitlista"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "Aktivera adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "Aktivera säkerhetskopiering av blockeringslistan"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "Aktiverad"
@@ -216,43 +216,43 @@ msgstr "Aktiverad"
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "Extra alternativ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "Tvinga lokal DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -273,18 +273,18 @@ msgstr "Kördes senast"
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
@@ -298,11 +298,11 @@ msgstr "Laddar"
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr ""
@@ -311,11 +311,11 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "Nej"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -341,11 +341,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "Vänligen redigera den här filen direkt i en terminal-session."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -357,13 +357,13 @@ msgstr "Fråga"
msgid "Query domains"
msgstr "Fråga efter domäner"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -384,32 +384,38 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -420,7 +426,7 @@ msgstr "Ã…teruppta"
msgid "Runtime Information"
msgstr "Information om körtid"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "SSL-rek."
@@ -430,29 +436,34 @@ msgstr "SSL-rek."
msgid "Save"
msgstr "Spara"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "Uppstartslösare"
@@ -466,19 +477,19 @@ msgstr "Stäng av"
msgid "Suspend / Resume Adblock"
msgstr "Upphäv / Återuppta adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -492,7 +503,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -525,7 +540,7 @@ msgstr ""
msgid "Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -539,11 +554,11 @@ msgstr ""
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr ""
@@ -555,21 +570,21 @@ msgstr "Väntar på att kommandot ska slutföras..."
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "Ja"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 4510e92499..0db673683c 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -1,11 +1,11 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -17,7 +17,7 @@ msgid "Action"
msgstr ""
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr ""
@@ -29,7 +29,7 @@ msgstr ""
msgid "Adblock Version"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr ""
@@ -42,15 +42,15 @@ msgstr ""
msgid "Answer"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr ""
@@ -67,7 +67,7 @@ msgstr ""
msgid "Blocked Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr ""
@@ -75,13 +75,13 @@ msgstr ""
msgid "Blocklist not found!"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -96,7 +96,7 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr ""
@@ -110,18 +110,18 @@ msgstr ""
msgid "Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr ""
@@ -134,11 +134,11 @@ msgstr ""
msgid "Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -151,7 +151,7 @@ msgstr ""
msgid "Domain"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr ""
@@ -171,37 +171,37 @@ msgstr ""
msgid "Edit Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr ""
@@ -209,43 +209,43 @@ msgstr ""
msgid "End Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
@@ -265,18 +265,18 @@ msgstr ""
msgid "Latest DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
@@ -290,11 +290,11 @@ msgstr ""
msgid "Logfile"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr ""
@@ -303,11 +303,11 @@ msgstr ""
msgid "Name / IP-Address"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr ""
@@ -333,11 +333,11 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
msgstr ""
@@ -349,13 +349,13 @@ msgstr ""
msgid "Query domains"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -376,32 +376,38 @@ msgstr ""
msgid "Refresh Report"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
+msgstr ""
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -412,7 +418,7 @@ msgstr ""
msgid "Runtime Information"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr ""
@@ -422,29 +428,34 @@ msgstr ""
msgid "Save"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
msgstr ""
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
+msgstr ""
+
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr ""
@@ -458,19 +469,19 @@ msgstr ""
msgid "Suspend / Resume Adblock"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr ""
@@ -484,7 +495,11 @@ msgstr ""
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
@@ -515,7 +530,7 @@ msgstr ""
msgid "Time"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -529,11 +544,11 @@ msgstr ""
msgid "Total DNS Queries"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr ""
@@ -545,21 +560,21 @@ msgstr ""
msgid "Whitelist"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 7f77fd855c..b03f8a0bbc 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -1,25 +1,25 @@
# liushuyu <liushuyu_011@163.com>, 2017.
-# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2017-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2018-10-01 10:02+0800\n"
+"PO-Revision-Date: 2019-01-03 20:37+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr "“Jailâ€æ‹¦æˆªåˆ—表创建"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -30,10 +30,10 @@ msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Action"
-msgstr ""
+msgstr "动作"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "Adblock"
@@ -45,7 +45,7 @@ msgstr "Adblock 状æ€"
msgid "Adblock Version"
msgstr "Adblock 版本"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "è§¦å‘ Adblock 开始处ç†å‰çš„é¢å¤–延迟(秒)。"
@@ -56,34 +56,34 @@ msgstr "高级"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Answer"
-msgstr ""
+msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr "存档类别"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "备份目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr "备份模å¼"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
-msgstr ""
+msgstr "黑åå•"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
msgid "Blocked DNS Queries"
-msgstr ""
+msgstr "已拦截的 DNS 请求"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
msgid "Blocked Domain"
-msgstr ""
+msgstr "已拦截的域å"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "拦截列表æ¥æº"
@@ -91,7 +91,7 @@ msgstr "拦截列表æ¥æº"
msgid "Blocklist not found!"
msgstr "拦截列表未找到ï¼"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -99,7 +99,7 @@ msgstr ""
"构建一个é¢å¤–的“Jailâ€åˆ—表(/tmp/adb_list.jail),除白åå•æ–‡ä»¶ä¸­åˆ—出的域å外,"
"阻止访问其他所有的域å。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -110,13 +110,13 @@ msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Client"
-msgstr ""
+msgstr "客户端"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "正在收集数æ®..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr "Adblock é…置工具,通过 DNS æ¥æ‹¦æˆªå¹¿å‘Šå’Œé˜»æ­¢åŸŸå。"
@@ -128,37 +128,37 @@ msgstr "Adblock é…置工具,通过 DNS æ¥æ‹¦æˆªå¹¿å‘Šå’Œé˜»æ­¢åŸŸå。"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
msgid "Count"
-msgstr ""
+msgstr "计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr "创建压缩的拦截列表备份,它们将在下载错误或备份模å¼å¯åŠ¨æœŸé—´ä½¿ç”¨ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS åŽç«¯ï¼ˆDNS 目录)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "DNS 目录"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
msgid "DNS Query Report"
-msgstr ""
+msgstr "DNS 查询报告"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
-msgstr ""
+msgstr "日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "æè¿°"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -169,9 +169,9 @@ msgstr "å¯åŠ¨æœŸé—´ä¸è¦è‡ªåŠ¨æ›´æ–° blocklists,改用 blocklists 的备份ã
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Domain"
-msgstr ""
+msgstr "域å"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "下载工具"
@@ -191,85 +191,85 @@ msgstr "编辑设置"
msgid "Edit Whitelist"
msgstr "编辑白åå•"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr "Email æ醒"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr "Email æ醒计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "å¯ç”¨ Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "å¯ç”¨ Blocklist 备份"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
-msgstr ""
+msgstr "å¯ç”¨ DNS 查询报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr "在低内存设备上å¯ç”¨ç§¯æžçš„内存整体排åº/é‡å¤ç§»é™¤ï¼ˆ&lt; 64 MB 空闲内存)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处ç†é”™è¯¯çš„情况下å¯ç”¨è¯¦ç»†è°ƒè¯•æ—¥å¿—记录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "å·²å¯ç”¨"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
msgid "End Date"
-msgstr ""
+msgstr "结æŸæ—¥æœŸ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "é¢å¤–选项"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "清空 DNS 缓存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 进程å¯åŠ¨åŽæ¸…空 DNS 缓存。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr "进一步信æ¯<a href=\"%s\" target=\"_blank\">请访问在线文档</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr "为了进一步æ高性能,您å¯ä»¥æ高此值,例如:8 或 16 应该是安全的。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "强制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr "强制整体排åº"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "白åå•æ–‡ä»¶çš„全路径。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
-msgstr ""
+msgstr "通过 tcpdump 收集 dns 有关的网络æµé‡ï¼Œä»¥æŒ‰éœ€æä¾› DNS 查询报告。"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
@@ -283,20 +283,20 @@ msgstr "最åŽè¿è¡Œ"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
msgid "Latest DNS Queries"
-msgstr ""
+msgstr "最新的 DNS 查询"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr "å¯ç”¨ç½‘络接å£åˆ—表。通常å¯åŠ¨å°†ç”±â€œwanâ€æŽ¥å£è§¦å‘。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr "支æŒçš„ DNS åŽç«¯åˆ—表åŠå…¶é»˜è®¤åˆ—表导出目录。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr "支æŒå’Œå®Œå…¨é¢„é…置的下载工具列表。"
@@ -308,26 +308,26 @@ msgstr "加载中"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
msgid "Logfile"
-msgstr ""
+msgstr "日志文件"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr "低优先级æœåŠ¡"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr "最大下载队列"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
msgid "Name / IP-Address"
-msgstr ""
+msgstr "å称 / IP 地å€"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "å¦"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在默认设置并ä¸é€‚åˆæ‚¨æ—¶çš„é¢å¤–选项。"
@@ -355,13 +355,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "请在终端会è¯ä¸­ç›´æŽ¥ç¼–辑此文件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
-msgstr ""
+msgstr "请注æ„:这需è¦æ‰‹åŠ¨å®‰è£…和设置“msmtpâ€è½¯ä»¶åŒ…。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
-msgstr ""
+msgstr "请注æ„:这需è¦æ‰‹åŠ¨å®‰è£…和设置“tcpdump-miniâ€è½¯ä»¶åŒ…。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
@@ -371,7 +371,7 @@ msgstr "查询"
msgid "Query domains"
msgstr "查询域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -379,7 +379,7 @@ msgstr ""
"如果总数å°äºŽæˆ–等于给定é™åˆ¶ï¼ˆé»˜è®¤ä¸º 0),请æ高最å°ç”µå­é‚®ä»¶é€šçŸ¥æ•°ï¼Œä»¥èŽ·å–电å­"
"邮件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -400,34 +400,40 @@ msgstr "刷新拦截列表æº"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
msgid "Refresh Report"
-msgstr ""
+msgstr "刷新报告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
-msgstr ""
+msgstr "报告区å—计数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
-msgstr ""
+msgstr "报告区å—大å°"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
-msgstr ""
+msgstr "报告目录"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
+msgstr "报告接å£"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
-msgstr ""
+msgstr "tcpdump 将使用的报告区å—计数(默认为“5â€ï¼‰ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
-msgstr ""
+msgstr "tcpdump 将使用的报告区å—大å°ï¼ˆMB)(默认为“1â€ï¼‰ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -438,7 +444,7 @@ msgstr "æ¢å¤"
msgid "Runtime Information"
msgstr "è¿è¡Œä¿¡æ¯"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "SSL è¦æ±‚"
@@ -448,29 +454,34 @@ msgstr "SSL è¦æ±‚"
msgid "Save"
msgstr "ä¿å­˜"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr "如果å‘生错误或域计数 &le; 0,å‘é€é€šçŸ¥ç”µå­é‚®ä»¶ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr "设置 nice 级别为“低优先级â€ï¼Œadblock åŽå°è¿›ç¨‹å°†ä»Žç³»ç»Ÿä¸­èŽ·å–更少的资æºã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
+msgstr "处ç†ä¸‹è½½é˜Ÿåˆ—的大å°åŠå¹¶è¡Œå¤„ç†åˆ—表(默认为“8â€ï¼‰ã€‚"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "å¯åŠ¨è§¦å‘器"
@@ -484,19 +495,20 @@ msgstr "æš‚åœ"
msgid "Suspend / Resume Adblock"
msgstr "æš‚åœ/æ¢å¤ Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
-msgstr ""
+msgstr "adblock 备份的目标目录。请仅使用éžæ˜“失性ç£ç›˜ï¼Œä¾‹å¦‚:一个外置 U 盘。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
+"dns 相关报告文件的目标目录。请优先使用éžæ˜“失性ç£ç›˜ï¼Œä¾‹å¦‚:一个外置 U 盘。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生æˆæ‹¦æˆªåˆ—表“adb_list.overallâ€çš„目标目录。"
@@ -510,7 +522,11 @@ msgstr "文件过大,无法使用 LuCI 的在线编辑(&ge; 100 KB)。"
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系统日志输出,仅针对 adblock 相关的消æ¯è¿›è¡Œäº†é¢„筛选。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需è¦æ‰‹åŠ¨åœæ­¢/é‡å¯æœåŠ¡æ‰èƒ½ç”Ÿæ•ˆã€‚"
@@ -539,9 +555,9 @@ msgstr "此表å•å…许您查询æŸäº›åŸŸçš„活动å—列表,例如用于列出
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
-msgstr ""
+msgstr "时间"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -549,17 +565,17 @@ msgstr "è¦è¦†ç›–默认路径,请使用下é¢é¢å¤–部分中的“DNS 目录â€
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
msgid "Top 10 Reporting"
-msgstr ""
+msgstr "å‰å报告"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
msgid "Total DNS Queries"
-msgstr ""
+msgstr "DNS 查询总数"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr "触å‘延迟"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr "详细的调试记录"
@@ -569,47 +585,27 @@ msgstr "正在等待命令完æˆâ€¦"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
msgid "Whitelist"
-msgstr ""
+msgstr "白åå•"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr "白åå•æ–‡ä»¶"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
-msgstr ""
+msgstr "您å¯ä»¥ä½¿ç”¨æ­¤é™åˆ¶æ€§æ‹¦æˆªåˆ—表,例如访客 wifi 或家长模å¼ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr "例如:è¦æŽ¥æ”¶æ¯ä¸ª adblock 更新的电å­é‚®ä»¶é€šçŸ¥æ—¶å°†æ­¤å€¼è®¾ç½®ä¸º 150000。"
-#~ msgid ""
-#~ "Please note: this needs additional 'msmtp' package installation and setup."
-#~ msgstr "请注æ„:这需è¦é¢å¤–的“msmtpâ€è½¯ä»¶åŒ…安装和设置。"
-
-#~ msgid ""
-#~ "Size of the download queue to handle downloads &amp; list processing in "
-#~ "parallel (default '4')."
-#~ msgstr "处ç†ä¸‹è½½é˜Ÿåˆ—的大å°åŠå¹¶è¡Œå¤„ç†åˆ—表(默认“4â€ï¼‰ã€‚"
-
-#~ msgid ""
-#~ "Target directory for adblock backups. Please use only non-volatile disks, "
-#~ "e.g. an external usb stick."
-#~ msgstr "adblock 备份的目标目录。请仅使用éžæ˜“失性ç£ç›˜ï¼Œä¾‹å¦‚:一个外置 U 盘。"
-
-#~ msgid "View Logfile"
-#~ msgstr "查看日志文件"
-
-#~ msgid ""
-#~ "You can use this restrictive blocklist manually e.g. for guest wifi or "
-#~ "kidsafe configurations."
-#~ msgstr ""
-#~ "您å¯ä»¥æ‰‹åŠ¨ä½¿ç”¨æ­¤é™åˆ¶æ€§æ‹¦æˆªåˆ—表,例如:为客人æä¾› wifi 或 kidsafe é…置。"
+#~ msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#~ msgstr "tcpdump 将使用的报告接å£ï¼ˆé»˜è®¤ä¸ºâ€œbr-lanâ€ï¼‰ã€‚"
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index 4c34c1a9a3..e3f91b8d93 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -1,25 +1,25 @@
# liushuyu <liushuyu_011@163.com>, 2017.
-# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2017-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2018-10-01 10:02+0800\n"
+"PO-Revision-Date: 2019-01-03 20:37+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:158
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:154
msgid "'Jail' Blocklist Creation"
msgstr "“Jailâ€æ””截列表建立"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:74
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:70
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
"than 64 MB free RAM, please only select a few of them!"
@@ -30,10 +30,10 @@ msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Action"
-msgstr ""
+msgstr "動作"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
msgid "Adblock"
msgstr "Adblock"
@@ -45,7 +45,7 @@ msgstr "Adblock 狀態"
msgid "Adblock Version"
msgstr "Adblock 版本"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:179
msgid "Additional trigger delay in seconds before adblock processing begins."
msgstr "觸發 Adblock 開始處ç†å‰çš„é¡å¤–延é²ï¼ˆç§’)。"
@@ -56,34 +56,34 @@ msgstr "高階"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Answer"
-msgstr ""
+msgstr "回答"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:92
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:88
msgid "Archive Categories"
msgstr "存檔類別"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:120
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
msgid "Backup Directory"
msgstr "備份目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:123
msgid "Backup Mode"
msgstr "備份模å¼"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
msgid "Blacklist"
-msgstr ""
+msgstr "黑åå–®"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:223
msgid "Blocked DNS Queries"
-msgstr ""
+msgstr "已攔截的 DNS 請求"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
msgid "Blocked Domain"
-msgstr ""
+msgstr "已攔截的域å"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:69
msgid "Blocklist Sources"
msgstr "攔截列表來æº"
@@ -91,7 +91,7 @@ msgstr "攔截列表來æº"
msgid "Blocklist not found!"
msgstr "攔截列表未找到ï¼"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:159
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:155
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
"domains except those listed in the whitelist file."
@@ -99,7 +99,7 @@ msgstr ""
"構建一個é¡å¤–的“Jailâ€åˆ—表(/tmp/adb_list.jail),除白å單檔案中列出的域å外,"
"阻止訪å•å…¶ä»–所有的域å。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:49
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
"timeout (default 30 sec.) or select another trigger interface."
@@ -110,13 +110,13 @@ msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Client"
-msgstr ""
+msgstr "客戶端"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
msgid "Collecting data..."
msgstr "正在收集資料..."
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
msgid ""
"Configuration of the adblock package to block ad/abuse domains by using DNS."
msgstr "Adblock é…ç½®å·¥å…·ï¼Œé€šéŽ DNS 來攔截廣告和阻止域å。"
@@ -128,37 +128,37 @@ msgstr "Adblock é…ç½®å·¥å…·ï¼Œé€šéŽ DNS 來攔截廣告和阻止域å。"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
msgid "Count"
-msgstr ""
+msgstr "計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr "建立壓縮的攔截列表備份,它們將在下載錯誤或備份模å¼å•Ÿå‹•æœŸé–“使用。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:159
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 後端(DNS 目錄)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:171
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:167
msgid "DNS Directory"
msgstr "DNS 目錄"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:19
msgid "DNS Query Report"
-msgstr ""
+msgstr "DNS 查詢報告"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Date"
-msgstr ""
+msgstr "日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:90
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
msgid "Description"
msgstr "æè¿°"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:124
msgid ""
"Do not automatically update blocklists during startup, use blocklist backups "
"instead."
@@ -169,9 +169,9 @@ msgstr "啟動期間ä¸è¦è‡ªå‹•æ›´æ–° blocklists,改用 blocklists 的備份ã
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Domain"
-msgstr ""
+msgstr "域å"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:35
msgid "Download Utility"
msgstr "下載工具"
@@ -191,86 +191,86 @@ msgstr "編輯設定"
msgid "Edit Whitelist"
msgstr "編輯白åå–®"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:151
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:147
msgid "Email Notification"
msgstr "Email æ醒"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
msgid "Email Notification Count"
msgstr "Email æ醒計數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:21
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:20
msgid "Enable Adblock"
msgstr "啟用 Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:116
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
msgid "Enable Blocklist Backup"
msgstr "啟用 Blocklist 備份"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:139
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:135
msgid "Enable DNS Query Report"
-msgstr ""
+msgstr "啟用 DNS 查詢報告"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:226
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
"在低記憶體è£ç½®ä¸Šå•Ÿç”¨ç©æ¥µçš„記憶體整體排åº/é‡è¤‡ç§»é™¤ï¼ˆ&lt; 64 MB 空閒記憶體)"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出ç¾ä»»ä½•è™•ç†éŒ¯èª¤çš„情æ³ä¸‹å•Ÿç”¨è©³ç´°é™¤éŒ¯æ—¥èªŒè¨˜éŒ„。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:73
msgid "Enabled"
msgstr "已啟用"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:211
msgid "End Date"
-msgstr ""
+msgstr "çµæŸæ—¥æœŸ"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:98
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
msgid "Extra Options"
msgstr "é¡å¤–é¸é …"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:183
msgid "Flush DNS Cache"
msgstr "清空 DNS å¿«å–"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:184
msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 程åºå•Ÿå‹•å¾Œæ¸…空 DNS å¿«å–。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:13
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:12
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪å•ç·šä¸Šæ–‡æª”</a>"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:130
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr "為了進一步æ高效能,您å¯ä»¥æ高此值,例如:8 或 16 應該是安全的。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:112
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:108
msgid "Force Local DNS"
msgstr "強制本地 DNS"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:225
msgid "Force Overall Sort"
msgstr "強制整體排åº"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:177
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:173
msgid "Full path to the whitelist file."
msgstr "白å單檔案的全路徑。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:136
msgid ""
"Gather dns related network traffic via tcpdump to provide a DNS Query Report "
"on demand."
-msgstr ""
+msgstr "é€šéŽ tcpdump 收集 dns 有關的網路æµé‡ï¼Œä»¥æŒ‰éœ€æä¾› DNS 查詢報告。"
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua:10
#: applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua:9
@@ -284,20 +284,20 @@ msgstr "最後執行"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:241
msgid "Latest DNS Queries"
-msgstr ""
+msgstr "最新的 DNS 查詢"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:48
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
"by the 'wan' interface."
msgstr "å¯ç”¨ç¶²è·¯ä»‹é¢åˆ—表。通常啟動將由“wanâ€ä»‹é¢è§¸ç™¼ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:25
msgid ""
"List of supported DNS backends with their default list export directory."
msgstr "支æ´çš„ DNS 後端列表åŠå…¶é è¨­åˆ—表匯出目錄。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:37
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
msgid "List of supported and fully pre-configured download utilities."
msgstr "支æ´å’Œå®Œå…¨é é…置的下載工具列表。"
@@ -309,26 +309,26 @@ msgstr "載入中"
#: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
msgid "Logfile"
-msgstr ""
+msgstr "日誌檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:105
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
msgid "Low Priority Service"
msgstr "低優先順åºæœå‹™"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:132
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:128
msgid "Max. Download Queue"
msgstr "最大下載佇列"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:26
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:69
msgid "Name / IP-Address"
-msgstr ""
+msgstr "å稱 / IP 地å€"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:86
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:82
msgid "No"
msgstr "å¦"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:99
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:95
msgid ""
"Options for further tweaking in case the defaults are not suitable for you."
msgstr "在é è¨­è¨­å®šä¸¦ä¸é©åˆæ‚¨æ™‚çš„é¡å¤–é¸é …。"
@@ -356,13 +356,13 @@ msgstr ""
msgid "Please edit this file directly in a terminal session."
msgstr "請在終端會話中直接編輯此檔案。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:153
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:149
msgid "Please note: this needs manual 'msmtp' package installation and setup."
-msgstr ""
+msgstr "請注æ„:這需è¦æ‰‹å‹•å®‰è£å’Œè¨­å®šâ€œmsmtpâ€è»Ÿé«”包。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:137
msgid "Please note: this needs manual 'tcpdump-mini' package installation."
-msgstr ""
+msgstr "請注æ„:這需è¦æ‰‹å‹•å®‰è£å’Œè¨­å®šâ€œtcpdump-miniâ€è»Ÿé«”包。"
#: applications/luci-app-adblock/luasrc/view/adblock/query.htm:52
msgid "Query"
@@ -372,7 +372,7 @@ msgstr "查詢"
msgid "Query domains"
msgstr "查詢域"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:165
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:161
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
"count is less or equal to the given limit (default 0),"
@@ -380,7 +380,7 @@ msgstr ""
"如果總數å°æ–¼æˆ–等於給定é™åˆ¶ï¼ˆé è¨­ç‚º 0),請æ高最å°é›»å­éƒµä»¶é€šçŸ¥æ•¸ï¼Œä»¥ç²å–é›»å­"
"郵件。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:113
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:109
msgid ""
"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
"and tcp protocol on ports 53, 853 and 5353."
@@ -401,34 +401,40 @@ msgstr "é‡æ–°æ•´ç†æ””截列表æº"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:230
msgid "Refresh Report"
-msgstr ""
+msgstr "é‡æ–°æ•´ç†å ±å‘Š"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:201
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:211
msgid "Report Chunk Count"
-msgstr ""
+msgstr "報告å€å¡Šè¨ˆæ•¸"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:218
msgid "Report Chunk Size"
-msgstr ""
+msgstr "報告å€å¡Šå¤§å°"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:144
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:140
msgid "Report Directory"
-msgstr ""
+msgstr "報告目錄"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:192
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:188
msgid "Report Interface"
+msgstr "報告介é¢"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:205
+msgid "Report Listen Port(s)"
msgstr ""
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:202
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:212
msgid "Report chunk count used by tcpdump (default '5')."
-msgstr ""
+msgstr "tcpdump 將使用的報告å€å¡Šè¨ˆæ•¸ï¼ˆé è¨­ç‚ºâ€œ5â€ï¼‰ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:219
msgid "Report chunk size used by tcpdump in MB (default '1')."
-msgstr ""
+msgstr "tcpdump 將使用的報告å€å¡Šå¤§å°ï¼ˆMB)(é è¨­ç‚ºâ€œ1â€ï¼‰ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:193
-msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:189
+msgid ""
+"Reporting interface used by tcpdump, set to 'any' for multiple interfaces "
+"(default 'br-lan')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:31
@@ -439,7 +445,7 @@ msgstr "æ¢å¾©"
msgid "Runtime Information"
msgstr "執行資訊"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:76
msgid "SSL req."
msgstr "SSL è¦æ±‚"
@@ -449,30 +455,35 @@ msgstr "SSL è¦æ±‚"
msgid "Save"
msgstr "儲存"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:148
msgid ""
"Send notification emails in case of a processing error or if domain count is "
"&le; 0."
msgstr "如果發生錯誤或域計數 &le; 0,傳é€é€šçŸ¥é›»å­éƒµä»¶ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:106
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:102
msgid ""
"Set the nice level to 'low priority' and the adblock background processing "
"will take less resources from the system."
msgstr ""
"設定 nice 級別為“低優先順åºâ€ï¼Œadblock 後臺程åºå°‡å¾žç³»çµ±ä¸­ç²å–更少的資æºã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:133
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:129
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
"parallel (default '8')."
+msgstr "處ç†ä¸‹è¼‰ä½‡åˆ—的大å°åŠä¸¦è¡Œè™•ç†åˆ—表(é è¨­ç‚ºâ€œ8â€ï¼‰ã€‚"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:206
+msgid ""
+"Space separated list of reporting port(s) used by tcpdump (default: '53')."
msgstr ""
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:205
msgid "Start Date"
-msgstr ""
+msgstr "開始日期"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:47
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:46
msgid "Startup Trigger"
msgstr "啟動觸發器"
@@ -486,19 +497,20 @@ msgstr "æš«åœ"
msgid "Suspend / Resume Adblock"
msgstr "æš«åœ/æ¢å¾© Adblock"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:121
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:117
msgid ""
"Target directory for adblock backups. Please use only a non-volatile disk, e."
"g. an external usb stick."
-msgstr ""
+msgstr "adblock 備份的目標目錄。請僅使用éžæ˜“失性ç£ç¢Ÿï¼Œä¾‹å¦‚:一個外接 U 盤。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:145
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:141
msgid ""
"Target directory for dns related report files. Please use preferably a non-"
"volatile disk, e.g. an external usb stick."
msgstr ""
+"dns 相關報告檔案的目標目錄。請優先使用éžæ˜“失性ç£ç¢Ÿï¼Œä¾‹å¦‚:一個外接 U 盤。"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:168
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "生æˆæ””截列表“adb_list.overallâ€çš„目標目錄。"
@@ -512,7 +524,11 @@ msgstr "檔案éŽå¤§ï¼Œç„¡æ³•ä½¿ç”¨ LuCI 的線上編輯(&ge; 100 KB)。"
msgid "The syslog output, pre-filtered for adblock related messages only."
msgstr "系統日誌輸出,僅é‡å° adblock 相關的訊æ¯é€²è¡Œäº†é ç¯©é¸ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:107
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:103
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:190
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:207
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:213
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:220
msgid "This change requires a manual service stop/re-start to take effect."
msgstr "此更改需è¦æ‰‹å‹•åœæ­¢/é‡å•Ÿæœå‹™æ‰èƒ½ç”Ÿæ•ˆã€‚"
@@ -541,9 +557,9 @@ msgstr "此表單å…許您查詢æŸäº›åŸŸçš„活動塊列表,例如用於列出
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:82
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
msgid "Time"
-msgstr ""
+msgstr "時間"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:27
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:26
msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
@@ -551,17 +567,17 @@ msgstr "è¦è¦†è“‹é è¨­è·¯å¾‘,請使用下é¢é¡å¤–部分中的“DNS 目錄â€
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:236
msgid "Top 10 Reporting"
-msgstr ""
+msgstr "å‰å報告"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:217
msgid "Total DNS Queries"
-msgstr ""
+msgstr "DNS 查詢總數"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:178
msgid "Trigger Delay"
msgstr "觸發延é²"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:101
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:97
msgid "Verbose Debug Logging"
msgstr "詳細的除錯記錄"
@@ -571,47 +587,27 @@ msgstr "正在等待指令完æˆâ€¦"
#: applications/luci-app-adblock/luasrc/view/adblock/report.htm:102
msgid "Whitelist"
-msgstr ""
+msgstr "白åå–®"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:176
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:172
msgid "Whitelist File"
msgstr "白å單檔案"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:84
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:80
msgid "Yes"
msgstr "是"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:160
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:156
msgid ""
"You can use this restrictive blocklist e.g. for guest wifi or kidsafe "
"configurations."
-msgstr ""
+msgstr "您å¯ä»¥ä½¿ç”¨æ­¤é™åˆ¶æ€§æ””截列表,例如訪客 wifi 或家長模å¼ã€‚"
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:166
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:162
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr "例如:è¦æŽ¥æ”¶æ¯å€‹ adblock æ›´æ–°çš„é›»å­éƒµä»¶é€šçŸ¥æ™‚將此值設定為 150000。"
-#~ msgid ""
-#~ "Please note: this needs additional 'msmtp' package installation and setup."
-#~ msgstr "請注æ„:這需è¦é¡å¤–的“msmtpâ€è»Ÿé«”包安è£å’Œè¨­å®šã€‚"
-
-#~ msgid ""
-#~ "Size of the download queue to handle downloads &amp; list processing in "
-#~ "parallel (default '4')."
-#~ msgstr "處ç†ä¸‹è¼‰ä½‡åˆ—的大å°åŠä¸¦è¡Œè™•ç†åˆ—表(é è¨­â€œ4â€ï¼‰ã€‚"
-
-#~ msgid ""
-#~ "Target directory for adblock backups. Please use only non-volatile disks, "
-#~ "e.g. an external usb stick."
-#~ msgstr "adblock 備份的目標目錄。請僅使用éžæ˜“失性ç£ç¢Ÿï¼Œä¾‹å¦‚:一個外接 U 盤。"
-
-#~ msgid "View Logfile"
-#~ msgstr "檢視日誌檔案"
-
-#~ msgid ""
-#~ "You can use this restrictive blocklist manually e.g. for guest wifi or "
-#~ "kidsafe configurations."
-#~ msgstr ""
-#~ "您å¯ä»¥æ‰‹å‹•ä½¿ç”¨æ­¤é™åˆ¶æ€§æ””截列表,例如:為客人æä¾› wifi 或 kidsafe é…置。"
+#~ msgid "Reporting interface used by tcpdump (default 'br-lan')."
+#~ msgstr "tcpdump 將使用的報告介é¢ï¼ˆé è¨­ç‚ºâ€œbr-lanâ€ï¼‰ã€‚"
diff --git a/applications/luci-app-ahcp/po/zh-cn/ahcp.po b/applications/luci-app-ahcp/po/zh-cn/ahcp.po
index 6e3a6a2253..a291befd78 100644
--- a/applications/luci-app-ahcp/po/zh-cn/ahcp.po
+++ b/applications/luci-app-ahcp/po/zh-cn/ahcp.po
@@ -64,7 +64,7 @@ msgstr "正在收集数æ®â€¦"
#: applications/luci-app-ahcp/luasrc/model/cbi/admin_network/proto_ahcp.lua:55
msgid "Disable DNS setup"
-msgstr ""
+msgstr "ç¦ç”¨ DNS 设置"
#: applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua:21
msgid "Forwarder"
diff --git a/applications/luci-app-ahcp/po/zh-tw/ahcp.po b/applications/luci-app-ahcp/po/zh-tw/ahcp.po
index e39667df25..d06bf90e55 100644
--- a/applications/luci-app-ahcp/po/zh-tw/ahcp.po
+++ b/applications/luci-app-ahcp/po/zh-tw/ahcp.po
@@ -64,7 +64,7 @@ msgstr "正在收集資料…"
#: applications/luci-app-ahcp/luasrc/model/cbi/admin_network/proto_ahcp.lua:55
msgid "Disable DNS setup"
-msgstr ""
+msgstr "ç¦ç”¨ DNS 設定"
#: applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua:21
msgid "Forwarder"
diff --git a/applications/luci-app-banip/luasrc/controller/banip.lua b/applications/luci-app-banip/luasrc/controller/banip.lua
index e201295d5f..3d75bec4d0 100644
--- a/applications/luci-app-banip/luasrc/controller/banip.lua
+++ b/applications/luci-app-banip/luasrc/controller/banip.lua
@@ -1,4 +1,4 @@
--- Copyright 2018 Dirk Brenken (dev@brenken.org)
+-- Copyright 2018-2019 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
module("luci.controller.banip", package.seeall)
@@ -30,8 +30,8 @@ function index()
end
function ban_action(name)
- if name == "do_refresh" then
- luci.sys.call("/etc/init.d/banip start >/dev/null 2>&1")
+ if name == "do_reload" then
+ luci.sys.call("/etc/init.d/banip reload >/dev/null 2>&1")
end
luci.http.prepare_content("text/plain")
luci.http.write("0")
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
index 53353175ef..b802f4d4b5 100644
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
+++ b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
@@ -1,4 +1,4 @@
--- Copyright 2018 Dirk Brenken (dev@brenken.org)
+-- Copyright 2018-2019 Dirk Brenken (dev@brenken.org)
-- This is free software, licensed under the Apache License, Version 2.0
local fs = require("nixio.fs")
@@ -99,96 +99,112 @@ e = m:section(NamedSection, "extra", "banip", translate("Extra Options"),
e1 = e:option(Flag, "ban_debug", translate("Verbose Debug Logging"),
translate("Enable verbose debug logging in case of any processing error."))
-e1.default = e1.disabled
e1.rmempty = false
e2 = e:option(Flag, "ban_nice", translate("Low Priority Service"),
translate("Set the nice level to 'low priority' and banIP background processing will take less resources from the system. ")
..translate("This change requires a manual service stop/re-start to take effect."))
-e2.default = e2.disabled
e2.disabled = "0"
e2.enabled = "10"
e2.rmempty = false
-e3 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
+e3 = e:option(Flag, "ban_backup", translate("Enable Blocklist Backup"),
+ translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in 'backup mode'."))
+e3.rmempty = false
+
+e4 = e:option(Value, "ban_backupdir", translate("Backup Directory"),
+ translate("Target directory for banIP backups. Please use preferably a non-volatile disk, e.g. an external usb stick."))
+e4:depends("ban_backup", 1)
+e4.datatype = "directory"
+e4.default = "/mnt"
+e4.rmempty = true
+
+e5 = e:option(Flag, "ban_backupboot", translate("Backup Mode"),
+ translate("Do not automatically update blocklists during startup, use their backups instead."))
+e5:depends("ban_backup", 1)
+e5.rmempty = true
+
+e6 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
translate("Size of the download queue to handle downloads &amp; IPset processing in parallel (default '8'). ")
.. translate("For further performance improvements you can raise this value, e.g. '16' or '32' should be safe."))
-e3.default = 8
-e3.datatype = "range(1,32)"
-e3.rmempty = false
+e6.default = 8
+e6.datatype = "range(1,32)"
+e6.rmempty = false
-e4 = e:option(Value, "ban_triggerdelay", translate("Trigger Delay"),
- translate("Additional trigger delay in seconds before banIP processing begins."))
-e4.default = 2
-e4.datatype = "range(1,60)"
-e4.optional = true
+-- Optional Extra Options
-e5 = e:option(Value, "ban_fetchparm", translate("Download Options"),
- translate("Special options for the selected download utility, e.g. '--timeout=20 --no-check-certificate -O'."))
-e5.optional = true
-
-e10 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
-e10.default = "input_wan_rule"
-e10.datatype = "uciname"
-e10.optional = true
-
-e11 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
-e11.default = "forwarding_wan_rule"
-e11.datatype = "uciname"
-e11.optional = true
-
-e12 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
-e12.default = "input_lan_rule"
-e12.datatype = "uciname"
-e12.optional = true
-
-e13 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
-e13.default = "forwarding_lan_rule"
-e13.datatype = "uciname"
-e13.optional = true
-
-e14 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
-e14:value("REJECT")
-e14:value("DROP")
-e14.default = "DROP"
-e14.optional = true
-
-e15 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
-e15:value("REJECT")
-e15:value("DROP")
-e15.default = "REJECT"
-e15.optional = true
-
-e16 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
-e16.default = "input_wan_rule"
-e16.datatype = "uciname"
-e16.optional = true
-
-e17 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
-e17.default = "forwarding_wan_rule"
-e17.datatype = "uciname"
-e17.optional = true
-
-e18 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
-e18.default = "input_lan_rule"
-e18.datatype = "uciname"
-e18.optional = true
-
-e19 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
-e19.default = "forwarding_lan_rule"
-e19.datatype = "uciname"
-e19.optional = true
-
-e20 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
-e20:value("REJECT")
-e20:value("DROP")
-e20.default = "DROP"
+e20 = e:option(Value, "ban_triggerdelay", translate("Trigger Delay"),
+ translate("Additional trigger delay in seconds before banIP processing begins."))
+e20.default = 2
+e20.datatype = "range(1,60)"
e20.optional = true
-e21 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
-e21:value("REJECT")
-e21:value("DROP")
-e21.default = "REJECT"
+e21 = e:option(Value, "ban_fetchparm", translate("Download Options"),
+ translate("Special options for the selected download utility, e.g. '--timeout=20 --no-check-certificate -O'."))
e21.optional = true
+e22 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
+e22.default = "input_wan_rule"
+e22.datatype = "uciname"
+e22.optional = true
+
+e23 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
+e23.default = "forwarding_wan_rule"
+e23.datatype = "uciname"
+e23.optional = true
+
+e24 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
+e24.default = "input_lan_rule"
+e24.datatype = "uciname"
+e24.optional = true
+
+e25 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
+e25.default = "forwarding_lan_rule"
+e25.datatype = "uciname"
+e25.optional = true
+
+e26 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
+e26:value("REJECT")
+e26:value("DROP")
+e26.default = "DROP"
+e26.optional = true
+
+e27 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
+e27:value("REJECT")
+e27:value("DROP")
+e27.default = "REJECT"
+e27.optional = true
+
+e28 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
+e28.default = "input_wan_rule"
+e28.datatype = "uciname"
+e28.optional = true
+
+e29 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
+e29.default = "forwarding_wan_rule"
+e29.datatype = "uciname"
+e29.optional = true
+
+e30 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
+e30.default = "input_lan_rule"
+e30.datatype = "uciname"
+e30.optional = true
+
+e31 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
+e31.default = "forwarding_lan_rule"
+e31.datatype = "uciname"
+e31.optional = true
+
+e32 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
+e32:value("REJECT")
+e32:value("DROP")
+e32.default = "DROP"
+e32.optional = true
+
+e33 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
+e33:value("REJECT")
+e33:value("DROP")
+e33.default = "REJECT"
+e33.optional = true
+
return m
diff --git a/applications/luci-app-banip/luasrc/view/banip/runtime.htm b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
index 08ef90399d..410528130c 100644
--- a/applications/luci-app-banip/luasrc/view/banip/runtime.htm
+++ b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
@@ -1,5 +1,5 @@
<%#
-Copyright 2018 Dirk Brenken (dev@brenken.org)
+Copyright 2018-2019 Dirk Brenken (dev@brenken.org)
This is free software, licensed under the Apache License, Version 2.0
-%>
@@ -13,8 +13,8 @@ This is free software, licensed under the Apache License, Version 2.0
var view = document.getElementById("value_1");
var input = json.data.status;
- btn1.value = "<%:Refresh%>";
- btn1.name = "do_refresh";
+ btn1.value = "<%:Reload%>";
+ btn1.name = "do_reload";
view.innerHTML = input || "-";
if (input != "running")
{
@@ -121,9 +121,9 @@ function btn_action(action)
</div>
<hr />
<div class="cbi-value" id="button_1">
- <label class="cbi-value-title" for="button_1"><%:Refresh IPSets%></label>
+ <label class="cbi-value-title" for="button_1"><%:Reload IPSets%></label>
<div class="cbi-value-field">
- <input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_refresh" value="<%:Refresh%>" onclick="btn_action(this)" />
+ <input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_reload" value="<%:Reload%>" onclick="btn_action(this)" />
<span id="btn1_running" class="btn_running"></span>
</div>
</div>
diff --git a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua
index 9dc0857509..2f06200146 100644
--- a/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua
+++ b/applications/luci-app-ddns/luasrc/model/cbi/ddns/global.lua
@@ -28,7 +28,7 @@ local ns = m:section( NamedSection, "global", "ddns",
.. [[<br /><strong>]]
.. translate("It is NOT recommended for casual users to change settings on this page.")
.. [[</strong><br />]]
- .. [[<a href="http://wiki.openwrt.org/doc/uci/ddns#version_2x1" target="_blank">]]
+ .. [[<a href="https://openwrt.org/docs/guide-user/base-system/ddns#section_ddns" target="_blank">]]
.. translate("For detailed information about parameter settings look here.")
.. [[</a>]]
)
diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua
index 6f0c7f0952..be7f3eeff4 100755
--- a/applications/luci-app-ddns/luasrc/tools/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua
@@ -21,7 +21,7 @@ function env_info(type)
end
local function has_curlssl()
- return (SYS.call( [[$(which curl) -V 2>&1 | grep "Protocols:" | grep -qF "https"]] ) ~= 0)
+ return (SYS.call( [[$(which curl) -V 2>&1 | grep -qF "https"]] ) == 0)
end
local function has_fetch()
@@ -103,7 +103,7 @@ function env_info(type)
end
local function has_nslookup()
- return (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)"]] ) ~= 0)
+ return (SYS.call( [[which nslookup >/dev/null 2>&1]] ) == 0)
end
if type == "has_bindhost" then
diff --git a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
index 8f0e3224b4..967110fbf8 100644
--- a/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
+++ b/applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
@@ -59,7 +59,7 @@ m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"),
translate("Configuration of the DNSCrypt-Proxy package. ")
.. translatef("For further information "
.. "<a href=\"%s\" target=\"_blank\">"
- .. "see the wiki online</a>", "https://wiki.openwrt.org/inbox/dnscrypt"))
+ .. "see the wiki online</a>", "https://openwrt.org/docs/guide-user/services/dns/dnscrypt"))
m:chain("dhcp")
function m.on_after_commit(self)
@@ -146,7 +146,7 @@ if not fs.access("/etc/resolv-crypt.conf") or fs.stat("/etc/resolv-crypt.conf").
translate("Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS upstream timeouts with multiple DNSCrypt instances.<br />")
.. translatef("For further information "
.. "<a href=\"%s\" target=\"_blank\">"
- .. "see the wiki online</a>", "https://wiki.openwrt.org/inbox/dnscrypt"))
+ .. "see the wiki online</a>", "https://openwrt.org/docs/guide-user/services/dns/dnscrypt"))
btn2.inputtitle = translate("Create Config File")
btn2.inputstyle = "apply"
btn2.disabled = false
diff --git a/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
new file mode 100644
index 0000000000..91a45b025b
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/po/zh-cn/https_dns_proxy.po
@@ -0,0 +1,56 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-03 22:46+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:41
+msgid "Group name"
+msgstr "组å称"
+
+#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:6
+msgid "HTTPS DNS Proxy"
+msgstr "HTTPS DNS 代ç†"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:3
+msgid "HTTPS DNS Proxy Settings"
+msgstr "HTTPS DNS 代ç†è®¾ç½®"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:6
+msgid "Instances"
+msgstr "实例"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:28
+msgid "Listen address"
+msgstr "监å¬åœ°å€"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+msgid "Listen port"
+msgstr "监å¬ç«¯å£"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:12
+msgid "Provider"
+msgstr "æ供商"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:49
+msgid "Proxy server"
+msgstr "代ç†æœåŠ¡å™¨"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:45
+msgid "Subnet address"
+msgstr "å­ç½‘地å€"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+msgid "User name"
+msgstr "用户å"
diff --git a/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po b/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
new file mode 100644
index 0000000000..7d893fcf86
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/po/zh-tw/https_dns_proxy.po
@@ -0,0 +1,56 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-03 22:46+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:41
+msgid "Group name"
+msgstr "組å稱"
+
+#: applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua:6
+msgid "HTTPS DNS Proxy"
+msgstr "HTTPS DNS 代ç†"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:3
+msgid "HTTPS DNS Proxy Settings"
+msgstr "HTTPS DNS 代ç†è¨­å®š"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:6
+msgid "Instances"
+msgstr "例項"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:28
+msgid "Listen address"
+msgstr "監è½ä½å€"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:32
+msgid "Listen port"
+msgstr "監è½åŸ "
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:12
+msgid "Provider"
+msgstr "æ供商"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:49
+msgid "Proxy server"
+msgstr "代ç†ä¼ºæœå™¨"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:45
+msgid "Subnet address"
+msgstr "å­ç¶²ä½å€"
+
+#: applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua:37
+msgid "User name"
+msgstr "使用者å稱"
diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
index 8bac6a7a7b..742864f301 100644
--- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
@@ -1,15 +1,15 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2017-2019.
#
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2018-10-01 10:10+0800\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"PO-Revision-Date: 2019-01-03 22:17+0800\n"
+"X-Generator: Poedit 2.2\n"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:153
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:169
@@ -98,7 +98,7 @@ msgstr "æ‰¾åˆ°æŽ¥å£ %s 的所有必需 IP 规则"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:36
msgid "Also scan this Routing table for connected networks"
-msgstr ""
+msgstr "åŒæ—¶æ‰«æ此路由表以查找已连接的网络"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:73
msgid "Check IP rules"
@@ -198,7 +198,7 @@ msgstr "Hotplug ifup"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:24
msgid "How often should rtmon update the interface routing table"
-msgstr ""
+msgstr "rtmon 应该多久更新一次接å£è·¯ç”±è¡¨"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:29
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:56
@@ -352,7 +352,7 @@ msgstr ""
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:69
msgid "Max TTL"
-msgstr ""
+msgstr "最大 TTL"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:85
msgid "Max packet latency [ms]"
@@ -535,7 +535,7 @@ msgstr "æ•…éšœæ¢å¤é—´éš”"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:39
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:40
msgid "Routing table %d"
-msgstr ""
+msgstr "路由表 %d"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:196
msgid "Routing table %s for interface %s found"
@@ -547,7 +547,7 @@ msgstr "没有找到路由表 %sï¼Œä¸ºæŽ¥å£ %s"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:35
msgid "Routing table lookup"
-msgstr ""
+msgstr "路由表查找"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:58
msgid "Rule"
@@ -679,7 +679,7 @@ msgstr "故障排除"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:23
msgid "Update interval"
-msgstr ""
+msgstr "æ›´æ–°é—´éš”"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:31
msgid "View the content of /etc/protocols for protocol description"
@@ -769,11 +769,3 @@ msgstr "从ä¸"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
msgid "unreachable (reject)"
msgstr "ä¸å¯è¾¾ï¼ˆæ‹’ç»ï¼‰"
-
-#~ msgid "Local source interface"
-#~ msgstr "本地æºæŽ¥å£"
-
-#~ msgid ""
-#~ "Use the IP address of this interface as source IP address for traffic "
-#~ "initiated by the router itself"
-#~ msgstr "使用该接å£çš„ IP 地å€ä½œä¸ºè·¯ç”±å™¨æœ¬èº«å‘èµ·çš„æµé‡çš„æº IP 地å€"
diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
index 1f274fd7b6..967d2aaeef 100644
--- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
@@ -1,15 +1,15 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2017-2019.
#
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2018-10-01 10:10+0800\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"PO-Revision-Date: 2019-01-03 22:17+0800\n"
+"X-Generator: Poedit 2.2\n"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:153
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:169
@@ -98,7 +98,7 @@ msgstr "æ‰¾åˆ°ä»‹é¢ %s 的所有必需 IP è¦å‰‡"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:36
msgid "Also scan this Routing table for connected networks"
-msgstr ""
+msgstr "åŒæ™‚掃æ此路由表以查詢已連線的網路"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:73
msgid "Check IP rules"
@@ -182,11 +182,11 @@ msgstr "é‡æ–°æ•´ç†é€£ç·šè·Ÿè¹¤è¡¨"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:220
msgid "Flush global firewall conntrack table on interface events"
-msgstr "在介é¢äº‹ä»¶è§¸ç™¼æ™‚é‡æ–°æ•´ç†å…¨åŸŸæ€§é˜²ç«ç‰†é€£ç·šè·Ÿè¹¤è¡¨"
+msgstr "在介é¢äº‹ä»¶è§¸ç™¼æ™‚é‡æ–°æ•´ç†å…¨å±€é˜²ç«ç‰†é€£ç·šè·Ÿè¹¤è¡¨"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:45
msgid "Globals"
-msgstr "全域性"
+msgstr "全局"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:76
msgid "Hotplug ifdown"
@@ -198,7 +198,7 @@ msgstr "Hotplug ifup"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:24
msgid "How often should rtmon update the interface routing table"
-msgstr ""
+msgstr "rtmon 應該多久更新一次介é¢è·¯ç”±è¡¨"
#: applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm:29
#: applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm:56
@@ -346,13 +346,13 @@ msgid ""
"rules"
msgstr ""
"MWAN 支æ´æœ€å¤š 252 個物ç†æˆ–é‚輯介é¢ã€‚<br />MWAN è¦æ±‚所有介é¢å¿…須在 /etc/"
-"config/network 中設定唯一的閘é“器èºé»žã€‚<br />å稱必須與 /etc/config/network "
-"中的介é¢å稱匹é…。<br />å稱å…許包括 A-Zã€a-zã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚<br />"
-"接å£ä¸æ‡‰è©²èˆ‡æˆå“¡ã€ç­–ç•¥ã€è¦å‰‡ä¸­çš„ä»»æ„一個設定項使用相åŒçš„å稱"
+"config/network 中設定唯一的閘é“器èºé»žã€‚<br />å稱必須與 /etc/config/network 中"
+"的介é¢å稱匹é…。<br />å稱å…許包括 A-Zã€a-zã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚<br />接"
+"å£ä¸æ‡‰è©²èˆ‡æˆå“¡ã€ç­–ç•¥ã€è¦å‰‡ä¸­çš„ä»»æ„一個設定項使用相åŒçš„å稱"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:69
msgid "Max TTL"
-msgstr ""
+msgstr "最大 TTL"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:85
msgid "Max packet latency [ms]"
@@ -389,9 +389,9 @@ msgid ""
">Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />Members "
"may not share the same name as configured interfaces, policies or rules"
msgstr ""
-"“æˆå“¡â€ç”¨ä¾†è¨­å®šæ¯ä¸€å€‹ MWAN 介é¢çš„èºé»žæ•¸ï¼ˆå³ä»‹é¢å„ªå…ˆé †åºï¼‰å’Œæ‰€ä½”比é‡ã€‚<br />å"
-"稱å…許包括 A-Z〠a-ã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚<br />æˆå“¡ä¸æ‡‰è©²èˆ‡ä»‹é¢ã€ç­–ç•¥ã€è¦"
-"則中的任æ„一個設定項使用相åŒçš„å稱"
+"“æˆå“¡â€ç”¨ä¾†è¨­å®šæ¯ä¸€å€‹ MWAN 介é¢çš„èºé»žæ•¸ï¼ˆå³ä»‹é¢å„ªå…ˆé †åºï¼‰å’Œæ‰€ä½”比é‡ã€‚<br />å稱"
+"å…許包括 A-Z〠a-ã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚<br />æˆå“¡ä¸æ‡‰è©²èˆ‡ä»‹é¢ã€ç­–ç•¥ã€è¦å‰‡"
+"中的任æ„一個設定項使用相åŒçš„å稱"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:60
msgid "Members assigned"
@@ -535,7 +535,7 @@ msgstr "æ•…éšœæ¢å¾©é–“éš”"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:39
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:40
msgid "Routing table %d"
-msgstr ""
+msgstr "路由表 %d"
#: applications/luci-app-mwan3/luasrc/controller/mwan3.lua:196
msgid "Routing table %s for interface %s found"
@@ -547,7 +547,7 @@ msgstr "沒有找到路由表 %sï¼Œç‚ºä»‹é¢ %s"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:35
msgid "Routing table lookup"
-msgstr ""
+msgstr "路由表查詢"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua:58
msgid "Rule"
@@ -569,8 +569,8 @@ msgid ""
"z, 0-9, _ and no spaces<br />Rules may not share the same name as configured "
"interfaces, members or policies"
msgstr ""
-"è¦å‰‡æŒ‡å®šå“ªäº›æµé‡å°‡ä½¿ç”¨ç‰¹å®šçš„ MWAN ç­–ç•¥<br />è¦å‰‡åŸºæ–¼ IP ä½å€ï¼ŒåŸ æˆ–å”è­°<br />"
-"è¦å‰‡å¾žä¸Šåˆ°ä¸‹åŒ¹é…<br />匹é…è¦å‰‡ä»¥ä¸‹çš„è¦å‰‡è¢«å¿½ç•¥<br />ä¸ç¬¦åˆä»»ä½•è¦å‰‡çš„æµé‡å°‡ä½¿"
+"è¦å‰‡æŒ‡å®šå“ªäº›æµé‡å°‡ä½¿ç”¨ç‰¹å®šçš„ MWAN ç­–ç•¥<br />è¦å‰‡åŸºæ–¼ IP ä½å€ï¼ŒåŸ æˆ–å”è­°<br /"
+">è¦å‰‡å¾žä¸Šåˆ°ä¸‹åŒ¹é…<br />匹é…è¦å‰‡ä»¥ä¸‹çš„è¦å‰‡è¢«å¿½ç•¥<br />ä¸ç¬¦åˆä»»ä½•è¦å‰‡çš„æµé‡å°‡ä½¿"
"用主路由表進行路由<br />目的地為已知(éžé è¨­ï¼‰ç¶²è·¯çš„æµé‡ç”±ä¸»è·¯ç”±è¡¨è™•ç†<br />"
"æµé‡ç¬¦åˆè¦å‰‡ï¼Œä½†è©²ç­–略的所有 WAN 介é¢é—œé–‰å¾Œéƒ½æœƒè¢«å¤±æ•ˆ<br />å稱å¯åŒ…å«å­—å…ƒ A-"
"Z,a-z,0-9,_ 和空格<br />è¦å‰‡ä¸èƒ½èˆ‡é…置的介é¢ã€æˆå“¡æˆ–策略共享相åŒçš„å稱"
@@ -640,12 +640,12 @@ msgid ""
"\"wwan0\")<br /><br />"
msgstr ""
"這裡å…許您修改“/etc/mwan3.userâ€çš„內容。<br />該檔案在 sysupgrade 期間也會ä¿"
-"留。<br /><br />注æ„:<br />該檔案會作為 shell 指令碼解釋。<br />指令碼的第一"
-"行必須是 &#34;#!/bin/sh&#34;,ä¸å¸¶å¼•è™Ÿã€‚<br />以 # 開頭的行是註釋,ä¸æœƒåŸ·è¡Œã€‚"
+"留。<br /><br />注æ„:<br />該檔案會作為 shell 指令碼解釋。<br />指令碼的第一行必"
+"須是 &#34;#!/bin/sh&#34;,ä¸å¸¶å¼•è™Ÿã€‚<br />以 # 開頭的行是註釋,ä¸æœƒé‹è¡Œã€‚"
"<br />將您的自定義 mwan3 動作放在這裡,他們將<br />在啟用 mwan3 的介é¢ä¸Š<br /"
-">在 netifd hotplug 介é¢äº‹ä»¶æ™‚執行。<br /><br />有三個主è¦çš„環境變數傳éžçµ¦é€™å€‹"
-"指令碼。<br /><br />$ACTION “ifupâ€æˆ–“ifdownâ€<br />$INTERFACE 啟動或åœæ­¢çš„介é¢"
-"å(例如“wanâ€æˆ–“wwanâ€ï¼‰<br />$DEVICE 啟動或åœæ­¢ä»‹é¢çš„物ç†è£ç½®å(例"
+">在 netifd hotplug 介é¢äº‹ä»¶æ™‚é‹è¡Œã€‚<br /><br />有三個主è¦çš„環境變數傳éžçµ¦é€™å€‹"
+"指令碼。<br /><br />$ACTION “ifupâ€æˆ–“ifdownâ€<br />$INTERFACE 啟動或åœæ­¢çš„介é¢å"
+"(例如“wanâ€æˆ–“wwanâ€ï¼‰<br />$DEVICE 啟動或åœæ­¢ä»‹é¢çš„物ç†è£ç½®å(例"
"如“eth0â€æˆ–“wwan0â€ï¼‰<br /><br />"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:30
@@ -679,7 +679,7 @@ msgstr "故障排除"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua:23
msgid "Update interval"
-msgstr ""
+msgstr "æ›´æ–°é–“éš”"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:31
msgid "View the content of /etc/protocols for protocol description"
@@ -769,11 +769,3 @@ msgstr "從ä¸"
#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:59
msgid "unreachable (reject)"
msgstr "ä¸å¯é”(拒絕)"
-
-#~ msgid "Local source interface"
-#~ msgstr "本地æºä»‹é¢"
-
-#~ msgid ""
-#~ "Use the IP address of this interface as source IP address for traffic "
-#~ "initiated by the router itself"
-#~ msgstr "使用該介é¢çš„ IP ä½å€ä½œç‚ºè·¯ç”±å™¨æœ¬èº«ç™¼èµ·çš„æµé‡çš„æº IP ä½å€"
diff --git a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua
index f7e399352f..637eb11736 100644
--- a/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua
+++ b/applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua
@@ -17,30 +17,29 @@ function index()
end
function _action_rate(rv, n)
- local has_ipv6 = nixio.fs.access("/proc/net/ipv6_route")
- if has_ipv6 then
- local c = io.popen("nft list chain inet nft-qos-monitor " .. n .. " 2>/dev/null")
- else
- local c = io.popen("nft list chain ip nft-qos-monitor " .. n .. " 2>/dev/null")
- end
+ local c = nixio.fs.access("/proc/net/ipv6_route") and
+ io.popen("nft list chain inet nft-qos-monitor " .. n .. " 2>/dev/null") or
+ io.popen("nft list chain ip nft-qos-monitor " .. n .. " 2>/dev/null")
+
if c then
for l in c:lines() do
- local _, i, p, b = l:match('^%s+ip ([^%s]+) ([^%s]+) counter packets (%d+) bytes (%d+)')
+ local _, i, p, b = l:match(
+ '^%s+ip ([^%s]+) ([^%s]+) counter packets (%d+) bytes (%d+)'
+ )
if i and p and b then
-- handle expression
- local r = {
+ rv[#rv + 1] = {
rule = {
- family = "inet",
- table = "nft-qos-monitor",
- chain = n,
- handle = 0,
- expr = {
+ family = "inet",
+ table = "nft-qos-monitor",
+ chain = n,
+ handle = 0,
+ expr = {
{ match = { right = i } },
{ counter = { packets = p, bytes = b } }
}
}
}
- rv[#rv + 1] = r
end
end
c:close()
diff --git a/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po b/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po
index ccddb48929..73ce11f5d0 100644
--- a/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po
+++ b/applications/luci-app-nft-qos/po/zh-cn/nft-qos.po
@@ -1,14 +1,17 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2019-01-03 22:28+0800\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.3\n"
-"Last-Translator: \n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: zh_CN\n"
@@ -20,7 +23,7 @@ msgstr "字节总数"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:141
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:160
msgid "Collecting data..."
-msgstr "正在收集数æ®"
+msgstr "正在收集数æ®â€¦"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:224
msgid "Comment"
@@ -72,7 +75,7 @@ msgstr "上传速率的默认值"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:75
msgid "Download Bandwidth (Mbps)"
-msgstr "下载带宽 (Mbps)"
+msgstr "下载带宽(Mbps)"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:135
msgid "Download Rate"
@@ -98,17 +101,17 @@ msgstr "主机å"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:134
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:153
msgid "IP Address"
-msgstr "IP地å€"
+msgstr "IP 地å€"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
msgid "IP Address(V4 / V6)"
-msgstr ""
+msgstr "IP 地å€ï¼ˆV4 / V6)"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
msgid "IP Address(V4 Only)"
-msgstr ""
+msgstr "IP 地å€ï¼ˆä»… V4)"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
msgid "Limit Enable"
@@ -121,7 +124,7 @@ msgstr "é™é€Ÿç±»åž‹"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:135
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:172
msgid "MAC (optional)"
-msgstr "物ç†åœ°å€(å¯é€‰)"
+msgstr "物ç†åœ°å€ï¼ˆå¯é€‰ï¼‰"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:48
msgid "MB"
@@ -133,15 +136,15 @@ msgstr "NFT-QoS 设置"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
-msgstr "æµé‡æ•´å½¢çš„目标网络接å£, 例如, br-lan, eth0.1, eth0, etc"
+msgstr "æµé‡æ•´å½¢çš„目标网络接å£ï¼Œä¾‹å¦‚br-lanã€eth0.1ã€eth0ç­‰"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
-msgstr "å°†è¦åº”用规则的网络, 例如, 192.168.1.0/24, 10.2.0.0/16, 等等"
+msgstr "å°†è¦åº”用规则的网络,例如192.168.1.0/24ã€10.2.0.0/16ç­‰"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
-msgstr "å°†è¦åº”用规则的网络, 例如, AAAA::BBBB/64, CCCC::1/128, 等等"
+msgstr "å°†è¦åº”用规则的网络,例如AAAA::BBBB/64ã€CCCC::1/128ç­‰"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
msgid "No information available"
@@ -163,7 +166,7 @@ msgstr "åè®®"
#: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
msgid "Qos over Nftables"
-msgstr "QoS Nftables版"
+msgstr "QoS Nftables 版"
#: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:139
@@ -173,7 +176,7 @@ msgstr "速率"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:130
msgid "Realtime Download Rate"
-msgstr ""
+msgstr "实时下载速率"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:125
msgid "Realtime Rate"
@@ -181,31 +184,31 @@ msgstr "实时速率显示"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:149
msgid "Realtime Upload Rate"
-msgstr ""
+msgstr "实时上传速率"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:221
msgid "Service"
-msgstr "æœåŠ¡/端å£"
+msgstr "æœåŠ¡"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:116
msgid "Static QoS-Download Rate"
-msgstr "é™æ€QoS-下载速率"
+msgstr "é™æ€ QoS-下载速率"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:153
msgid "Static QoS-Upload Rate"
-msgstr "é™æ€QoS-上传速率"
+msgstr "é™æ€ QoS-上传速率"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
msgid "Target Network (IPv4/MASK)"
-msgstr "目标网络(IPv4地å€/掩ç )"
+msgstr "目标网络(IPv4 地å€/掩ç ï¼‰"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
msgid "Target Network6 (IPv6/MASK)"
-msgstr "目标网络v6(IPv6地å€/掩ç )"
+msgstr "目标网络 v6(IPv6 地å€/掩ç ï¼‰"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:127
msgid "This page gives an overview over currently download/upload rate."
-msgstr "该页é¢æ供了当å‰ä¸Šä¼ å’Œä¸‹è½½é€ŸçŽ‡çš„一个总览"
+msgstr "该页é¢æ供了当å‰ä¸Šä¼ å’Œä¸‹è½½é€ŸçŽ‡çš„一个总览。"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:194
msgid "Traffic Priority Settings"
@@ -222,7 +225,7 @@ msgstr "å•ä½"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:80
msgid "Upload Bandwidth (Mbps)"
-msgstr "上传带宽 (Mbps)"
+msgstr "上传带宽(Mbps)"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:154
msgid "Upload Rate"
@@ -234,17 +237,8 @@ msgstr "é™é€Ÿç™½åå•"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:221
msgid "e.g. https, 23, (separator is comma)"
-msgstr "例如, https, 23 (用逗å·åˆ†éš”)"
+msgstr "例如https, 23(用逗å·åˆ†éš”)"
#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:44
msgid "kB"
msgstr "kB"
-
-#~ msgid "Dynamic Rate Limit"
-#~ msgstr "动æ€QoS"
-
-#~ msgid "Rate Limit"
-#~ msgstr "速率é™åˆ¶"
-
-#~ msgid "Traffic Priority"
-#~ msgstr "æµé‡ä¼˜å…ˆçº§"
diff --git a/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po b/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po
new file mode 100644
index 0000000000..5be9d8abf6
--- /dev/null
+++ b/applications/luci-app-nft-qos/po/zh-tw/nft-qos.po
@@ -0,0 +1,244 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-03 22:28+0800\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_TW\n"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155
+msgid "Bytes Total"
+msgstr "ä½å…ƒçµ„總數"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:141
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:160
+msgid "Collecting data..."
+msgstr "正在收集資料…"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:224
+msgid "Comment"
+msgstr "註釋"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:48
+msgid "Default Download Rate"
+msgstr "é è¨­ä¸‹è¼‰é€ŸçŽ‡"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:53
+msgid "Default Download Unit"
+msgstr "é è¨­ä¸‹è¼‰é€ŸçŽ‡å–®ä½"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
+msgid "Default Network Interface"
+msgstr "é è¨­ç¶²è·¯ä»‹é¢"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:60
+msgid "Default Upload Rate"
+msgstr "é è¨­ä¸Šå‚³é€ŸçŽ‡"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:65
+msgid "Default Upload Unit"
+msgstr "é è¨­ä¸Šå‚³é€ŸçŽ‡å–®ä½"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:53
+msgid "Default unit for download rate"
+msgstr "é è¨­çš„下載速率單ä½"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:65
+msgid "Default unit for upload rate"
+msgstr "é è¨­çš„上傳速率單ä½"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:75
+msgid "Default value for download bandwidth"
+msgstr "下載頻寬的é è¨­å€¼"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:48
+msgid "Default value for download rate"
+msgstr "下載速率的é è¨­å€¼"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:80
+msgid "Default value for upload bandwidth"
+msgstr "上傳頻寬的é è¨­å€¼"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:60
+msgid "Default value for upload rate"
+msgstr "上傳速率的é è¨­å€¼"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:75
+msgid "Download Bandwidth (Mbps)"
+msgstr "下載頻寬(Mbps)"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:135
+msgid "Download Rate"
+msgstr "下載速率"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
+msgid "Enable Limit Rate Feature"
+msgstr "開啟速率é™åˆ¶åŠŸèƒ½"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:103
+msgid "Enable Traffic Priority"
+msgstr "é–‹å•Ÿæµé‡å„ªå…ˆé †åº"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:103
+msgid "Enable this feature"
+msgstr "開啟這個功能"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:121
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:158
+msgid "Hostname"
+msgstr "主機å"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:134
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:153
+msgid "IP Address"
+msgstr "IP ä½å€"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:126
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:163
+msgid "IP Address(V4 / V6)"
+msgstr "IP ä½å€ï¼ˆV4 / V6)"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:128
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:165
+msgid "IP Address(V4 Only)"
+msgstr "IP ä½å€ï¼ˆåƒ… V4)"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:38
+msgid "Limit Enable"
+msgstr "é™é€Ÿé–‹å•Ÿ"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:42
+msgid "Limit Type"
+msgstr "é™é€Ÿåž‹åˆ¥"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:135
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:172
+msgid "MAC (optional)"
+msgstr "實體ä½å€ï¼ˆå¯é¸ï¼‰"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:48
+msgid "MB"
+msgstr "MB"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:28
+msgid "NFT-QoS Settings"
+msgstr "NFT-QoS 設定"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:107
+msgid "Network Interface for Traffic Shaping, e.g. br-lan, eth0.1, eth0, etc"
+msgstr "æµé‡æ•´å½¢çš„目標網路介é¢ï¼Œä¾‹å¦‚br-lanã€eth0.1ã€eth0ç­‰"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
+msgid "Network to be apply, e.g. 192.168.1.0/24, 10.2.0.0/16, etc"
+msgstr "å°‡è¦æ‡‰ç”¨è¦å‰‡çš„網路,例如192.168.1.0/24ã€10.2.0.0/16ç­‰"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
+msgid "Network to be apply, e.g. AAAA::BBBB/64, CCCC::1/128, etc"
+msgstr "å°‡è¦æ‡‰ç”¨è¦å‰‡çš„網路,例如AAAA::BBBB/64ã€CCCC::1/128ç­‰"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:65
+msgid "No information available"
+msgstr "沒有更多的資訊"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:137
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:156
+msgid "Packets Total"
+msgstr "資料包總數"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:207
+msgid "Priority"
+msgstr "優先順åº"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:199
+msgid "Protocol"
+msgstr "å”è­°"
+
+#: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:16
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:23
+msgid "Qos over Nftables"
+msgstr "QoS Nftables 版"
+
+#: applications/luci-app-nft-qos/luasrc/controller/nft-qos.lua:12
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:139
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:176
+msgid "Rate"
+msgstr "速率"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:130
+msgid "Realtime Download Rate"
+msgstr "實時下載速率"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:125
+msgid "Realtime Rate"
+msgstr "實時速率顯示"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:149
+msgid "Realtime Upload Rate"
+msgstr "實時上傳速率"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:221
+msgid "Service"
+msgstr "æœå‹™"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:116
+msgid "Static QoS-Download Rate"
+msgstr "éœæ…‹ QoS-下載速率"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:153
+msgid "Static QoS-Upload Rate"
+msgstr "éœæ…‹ QoS-上傳速率"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:85
+msgid "Target Network (IPv4/MASK)"
+msgstr "目標網路(IPv4 ä½å€/掩碼)"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:91
+msgid "Target Network6 (IPv6/MASK)"
+msgstr "目標網路 v6(IPv6 ä½å€/掩碼)"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:127
+msgid "This page gives an overview over currently download/upload rate."
+msgstr "該é é¢æ供了當å‰ä¸Šå‚³å’Œä¸‹è¼‰é€ŸçŽ‡çš„一個總覽。"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:194
+msgid "Traffic Priority Settings"
+msgstr "æµé‡å„ªå…ˆé †åºè¨­å®š"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:42
+msgid "Type of Limit Rate"
+msgstr "é™é€Ÿçš„型別"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:144
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:181
+msgid "Unit"
+msgstr "å–®ä½"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:80
+msgid "Upload Bandwidth (Mbps)"
+msgstr "上傳頻寬(Mbps)"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:154
+msgid "Upload Rate"
+msgstr "上傳速率"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:96
+msgid "White List for Limit Rate"
+msgstr "é™é€Ÿç™½åå–®"
+
+#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:221
+msgid "e.g. https, 23, (separator is comma)"
+msgstr "例如https, 23(用逗號分隔)"
+
+#: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:44
+msgid "kB"
+msgstr "kB"
diff --git a/applications/luci-app-nut/po/en/nut.po b/applications/luci-app-nut/po/en/nut.po
new file mode 100644
index 0000000000..0f22c26ae0
--- /dev/null
+++ b/applications/luci-app-nut/po/en/nut.po
@@ -0,0 +1,603 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2019-01-09 06:58-0500\n"
+"Last-Translator: Daniel F. Dickinson <cshored@thecshore.com>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:216
+msgid "Additional Shutdown Time(s)"
+msgstr "Additional Shutdown Time(s)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:37
+msgid "Addresses on which to listen"
+msgstr "Addresses on which to listen"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:23
+msgid "Allowed actions"
+msgstr "Allowed actions"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "As configured by NUT"
+msgstr "As configured by NUT"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Bytes to read from interrupt pipe"
+msgstr "Bytes to read from interrupt pipe"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "CA Certificate path"
+msgstr "CA Certificate path"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:73
+msgid "Certificate file (SSL)"
+msgstr "Certificate file (SSL)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:63
+msgid "Communications lost message"
+msgstr "Communications lost message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:60
+msgid "Communications restored message"
+msgstr "Communications restored message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:35
+msgid "Control UPS via CGI"
+msgstr "Control UPS via CGI"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:43
+msgid "Deadtime"
+msgstr "Deadtime"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Default for UPSes without this field."
+msgstr "Default for UPSes without this field."
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Delay for kill power command"
+msgstr "Delay for kill power command"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "Delay to power on UPS if power returns after kill power"
+msgstr "Delay to power on UPS if power returns after kill power"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:129
+msgid "Description (Display)"
+msgstr "Description (Display)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:32
+msgid "Display name"
+msgstr "Display name"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "Don't lock port when starting driver"
+msgstr "Don't lock port when starting driver"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:132
+msgid "Driver"
+msgstr "Driver"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:114
+msgid "Driver Configuration"
+msgstr "Driver Configuration"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:77
+msgid "Driver Global Settings"
+msgstr "Driver Global Settings"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Driver Path"
+msgstr "Driver Path"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:212
+msgid "Driver Shutdown Order"
+msgstr "Driver Shutdown Order"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Driver waits for data to be consumed by upsd before publishing more."
+msgstr "Driver waits for data to be consumed by upsd before publishing more."
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+msgid "Drop privileges to this user"
+msgstr "Drop privileges to this user"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:40
+msgid "Enable"
+msgstr "Enable"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid ""
+"Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) "
+"group read-write as user 'nut'"
+msgstr ""
+"Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) "
+"group read-write as user 'nut'"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:93
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:102
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:110
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:118
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:126
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:134
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:142
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:150
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:158
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:166
+msgid "Execute notify command"
+msgstr "Execute notify command"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:26
+msgid "Forced Shutdown"
+msgstr "Forced Shutdown"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:57
+msgid "Forced shutdown message"
+msgstr "Forced shutdown message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:10
+msgid "Global Settings"
+msgstr "Global Settings"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:13
+msgid "Go to NUT CGI"
+msgstr "Go to NUT CGI"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:16
+msgid "Host"
+msgstr "Host"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:23
+msgid "Hostname or IP address"
+msgstr "Hostname or IP address"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:191
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:220
+msgid "Hostname or address of UPS"
+msgstr "Hostname or address of UPS"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:39
+msgid "Hot Sync"
+msgstr "Hot Sync"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:41
+msgid "IP Address"
+msgstr "IP Address"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:95
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:104
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:112
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:120
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:128
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:136
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:144
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:152
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:160
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:168
+msgid "Ignore"
+msgstr "Ignore"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:142
+msgid "Ignore Low Battery"
+msgstr "Ignore Low Battery"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid "Instant commands"
+msgstr "Instant commands"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:146
+msgid "Interrupt Only"
+msgstr "Interrupt Only"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Interrupt Size"
+msgstr "Interrupt Size"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:54
+msgid "Low battery message"
+msgstr "Low battery message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:163
+msgid "Manufacturer (Display)"
+msgstr "Manufacturer (Display)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:34
+msgid "Master"
+msgstr "Master"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Max USB HID Length Reported"
+msgstr "Max USB HID Length Reported"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Maximum Age of Data"
+msgstr "Maximum Age of Data"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Maximum Start Delay"
+msgstr "Maximum Start Delay"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:67
+msgid "Maximum connections"
+msgstr "Maximum connections"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maximum number of times to try starting a driver."
+msgstr "Maximum number of times to try starting a driver."
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Maximum time in seconds between refresh of UPS status"
+msgstr "Maximum time in seconds between refresh of UPS status"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maxium Retries"
+msgstr "Maxium Retries"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Maxium Start Delay"
+msgstr "Maxium Start Delay"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:17
+msgid "Minimum required number or power supplies"
+msgstr "Minimum required number or power supplies"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:166
+msgid "Model (Display)"
+msgstr "Model (Display)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:9
+msgid "NUT CGI Access"
+msgstr "NUT CGI Access"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:12
+msgid "NUT Users"
+msgstr "NUT Users"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "Name of UPS"
+msgstr "Name of UPS"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:11
+msgid "Network UPS Tools"
+msgstr "Network UPS Tools"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:22
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:6
+msgid "Network UPS Tools (CGI)"
+msgstr "Network UPS Tools (CGI)"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:18
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:7
+msgid "Network UPS Tools (Monitor)"
+msgstr "Network UPS Tools (Monitor)"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:9
+msgid "Network UPS Tools (Server)"
+msgstr "Network UPS Tools (Server)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:7
+msgid "Network UPS Tools CGI Configuration"
+msgstr "Network UPS Tools CGI Configuration"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:8
+msgid "Network UPS Tools Monitoring Configuration"
+msgstr "Network UPS Tools Monitoring Configuration"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:10
+msgid "Network UPS Tools Server Configuration"
+msgstr "Network UPS Tools Server Configuration"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "No Lock"
+msgstr "No Lock"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:72
+msgid "No communications message"
+msgstr "No communications message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:173
+msgid "No low/high voltage transfer OIDs"
+msgstr "No low/high voltage transfer OIDs"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:75
+msgid "No parent message"
+msgstr "No parent message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:90
+msgid "Notification defaults"
+msgstr "Notification defaults"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:26
+msgid "Notify command"
+msgstr "Notify command"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:99
+msgid "Notify when back online"
+msgstr "Notify when back online"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:163
+msgid "Notify when battery needs replacing"
+msgstr "Notify when battery needs replacing"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:147
+msgid "Notify when communications lost"
+msgstr "Notify when communications lost"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:139
+msgid "Notify when communications restored"
+msgstr "Notify when communications restored"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:131
+msgid "Notify when force shutdown"
+msgstr "Notify when force shutdown"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:115
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:123
+msgid "Notify when low battery"
+msgstr "Notify when low battery"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:107
+msgid "Notify when on battery"
+msgstr "Notify when on battery"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:155
+msgid "Notify when shutting down"
+msgstr "Notify when shutting down"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Off Delay(s)"
+msgstr "Off Delay(s)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "On Delay(s)"
+msgstr "On Delay(s)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:51
+msgid "On battery message"
+msgstr "On battery message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:48
+msgid "Online message"
+msgstr "Online message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:208
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:237
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:19
+msgid "Password"
+msgstr "Password"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "Path containing ca certificates to match against host certificate"
+msgstr "Path containing ca certificates to match against host certificate"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Path to drivers (instead of default)"
+msgstr "Path to drivers (instead of default)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:63
+msgid "Path to state file"
+msgstr "Path to state file"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Period after which data is considered stale"
+msgstr "Period after which data is considered stale"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Poll Interval"
+msgstr "Poll Interval"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:29
+msgid "Poll frequency"
+msgstr "Poll frequency"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:34
+msgid "Poll frequency alert"
+msgstr "Poll frequency alert"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197
+msgid "Polling Frequency(s)"
+msgstr "Polling Frequency(s)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:224
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:46
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:202
+msgid "Port"
+msgstr "Port"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:200
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:229
+msgid "Power value"
+msgstr "Power value"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:206
+msgid "Product (regex)"
+msgstr "Product (regex)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:69
+msgid "Replace battery message"
+msgstr "Replace battery message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Require SSL and make sure server CN matches hostname"
+msgstr "Require SSL and make sure server CN matches hostname"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Retry Delay"
+msgstr "Retry Delay"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:32
+msgid "Role"
+msgstr "Role"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "Run drivers in a chroot(2) environment"
+msgstr "Run drivers in a chroot(2) environment"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid "RunAs User"
+msgstr "RunAs User"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:125
+msgid "SNMP Community"
+msgstr "SNMP Community"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:222
+msgid "SNMP retries"
+msgstr "SNMP retries"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:226
+msgid "SNMP timeout(s)"
+msgstr "SNMP timeout(s)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:230
+msgid "SNMP version"
+msgstr "SNMP version"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:232
+msgid "SNMPv1"
+msgstr "SNMPv1"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:233
+msgid "SNMPv2c"
+msgstr "SNMPv2c"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:234
+msgid "SNMPv3"
+msgstr "SNMPv3"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:219
+msgid "Serial Number"
+msgstr "Serial Number"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid "Set USB serial port permissions"
+msgstr "Set USB serial port permissions"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:25
+msgid "Set variables"
+msgstr "Set variables"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:22
+msgid "Shutdown command"
+msgstr "Shutdown command"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:66
+msgid "Shutdown message"
+msgstr "Shutdown message"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33
+msgid "Slave"
+msgstr "Slave"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Synchronous Communication"
+msgstr "Synchronous Communication"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:115
+msgid "The name of this section will be used as UPS name elsewhere"
+msgstr "The name of this section will be used as UPS name elsewhere"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Time in seconds between driver start retry attempts."
+msgstr "Time in seconds between driver start retry attempts."
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Time in seconds that upsdrvctl will wait for driver to finish starting"
+msgstr "Time in seconds that upsdrvctl will wait for driver to finish starting"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183
+msgid "UPS Master"
+msgstr "UPS Master"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51
+msgid "UPS Server Global Settings"
+msgstr "UPS Server Global Settings"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212
+msgid "UPS Slave"
+msgstr "UPS Slave"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+msgid "UPS name"
+msgstr "UPS name"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:121
+msgid "USB Bus(es) (regex)"
+msgstr "USB Bus(es) (regex)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:209
+msgid "USB Product Id"
+msgstr "USB Product Id"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:241
+msgid "USB Vendor Id"
+msgstr "USB Vendor Id"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid ""
+"Use upscmd -l to see full list which the commands your UPS supports "
+"(requires upscmd package)"
+msgstr ""
+"Use upscmd -l to see full list which the commands your UPS supports "
+"(requires upscmd package)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid ""
+"User as which to execute driver; requires device file accessed by driver to "
+"be read-write for that user."
+msgstr ""
+"User as which to execute driver; requires device file accessed by driver to "
+"be read-write for that user."
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:205
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:234
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:16
+msgid "Username"
+msgstr "Username"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:238
+msgid "Vendor (regex)"
+msgstr "Vendor (regex)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Verify all connection with SSL"
+msgstr "Verify all connection with SSL"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Workaround for buggy firmware"
+msgstr "Workaround for buggy firmware"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:94
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:103
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:111
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:119
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:127
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:135
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:143
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:151
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:159
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:167
+msgid "Write to syslog"
+msgstr "Write to syslog"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "chroot"
+msgstr "chroot"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+msgid "upsmon drops privileges to this user"
+msgstr "upsmon drops privileges to this user"
diff --git a/applications/luci-app-nut/po/templates/nut.pot b/applications/luci-app-nut/po/templates/nut.pot
new file mode 100644
index 0000000000..945c31ddab
--- /dev/null
+++ b/applications/luci-app-nut/po/templates/nut.pot
@@ -0,0 +1,588 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:216
+msgid "Additional Shutdown Time(s)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:37
+msgid "Addresses on which to listen"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:23
+msgid "Allowed actions"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "As configured by NUT"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Bytes to read from interrupt pipe"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "CA Certificate path"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:73
+msgid "Certificate file (SSL)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:63
+msgid "Communications lost message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:60
+msgid "Communications restored message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:35
+msgid "Control UPS via CGI"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:43
+msgid "Deadtime"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Default for UPSes without this field."
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Delay for kill power command"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "Delay to power on UPS if power returns after kill power"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:129
+msgid "Description (Display)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:32
+msgid "Display name"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "Don't lock port when starting driver"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:132
+msgid "Driver"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:114
+msgid "Driver Configuration"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:77
+msgid "Driver Global Settings"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Driver Path"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:212
+msgid "Driver Shutdown Order"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Driver waits for data to be consumed by upsd before publishing more."
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+msgid "Drop privileges to this user"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:40
+msgid "Enable"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid ""
+"Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) "
+"group read-write as user 'nut'"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:93
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:102
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:110
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:118
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:126
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:134
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:142
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:150
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:158
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:166
+msgid "Execute notify command"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:26
+msgid "Forced Shutdown"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:57
+msgid "Forced shutdown message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:10
+msgid "Global Settings"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:13
+msgid "Go to NUT CGI"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:16
+msgid "Host"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:23
+msgid "Hostname or IP address"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:191
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:220
+msgid "Hostname or address of UPS"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:39
+msgid "Hot Sync"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:41
+msgid "IP Address"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:95
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:104
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:112
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:120
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:128
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:136
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:144
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:152
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:160
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:168
+msgid "Ignore"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:142
+msgid "Ignore Low Battery"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid "Instant commands"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:146
+msgid "Interrupt Only"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Interrupt Size"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:54
+msgid "Low battery message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:163
+msgid "Manufacturer (Display)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:34
+msgid "Master"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Max USB HID Length Reported"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Maximum Age of Data"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Maximum Start Delay"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:67
+msgid "Maximum connections"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maximum number of times to try starting a driver."
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Maximum time in seconds between refresh of UPS status"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maxium Retries"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Maxium Start Delay"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:17
+msgid "Minimum required number or power supplies"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:166
+msgid "Model (Display)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:9
+msgid "NUT CGI Access"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:12
+msgid "NUT Users"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "Name of UPS"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:11
+msgid "Network UPS Tools"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:22
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:6
+msgid "Network UPS Tools (CGI)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:18
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:7
+msgid "Network UPS Tools (Monitor)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:9
+msgid "Network UPS Tools (Server)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:7
+msgid "Network UPS Tools CGI Configuration"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:8
+msgid "Network UPS Tools Monitoring Configuration"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:10
+msgid "Network UPS Tools Server Configuration"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "No Lock"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:72
+msgid "No communications message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:173
+msgid "No low/high voltage transfer OIDs"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:75
+msgid "No parent message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:90
+msgid "Notification defaults"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:26
+msgid "Notify command"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:99
+msgid "Notify when back online"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:163
+msgid "Notify when battery needs replacing"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:147
+msgid "Notify when communications lost"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:139
+msgid "Notify when communications restored"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:131
+msgid "Notify when force shutdown"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:115
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:123
+msgid "Notify when low battery"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:107
+msgid "Notify when on battery"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:155
+msgid "Notify when shutting down"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Off Delay(s)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "On Delay(s)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:51
+msgid "On battery message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:48
+msgid "Online message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:208
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:237
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:19
+msgid "Password"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "Path containing ca certificates to match against host certificate"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Path to drivers (instead of default)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:63
+msgid "Path to state file"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Period after which data is considered stale"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Poll Interval"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:29
+msgid "Poll frequency"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:34
+msgid "Poll frequency alert"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197
+msgid "Polling Frequency(s)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:224
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:46
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:202
+msgid "Port"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:200
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:229
+msgid "Power value"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:206
+msgid "Product (regex)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:69
+msgid "Replace battery message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Require SSL and make sure server CN matches hostname"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Retry Delay"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:32
+msgid "Role"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "Run drivers in a chroot(2) environment"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid "RunAs User"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:125
+msgid "SNMP Community"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:222
+msgid "SNMP retries"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:226
+msgid "SNMP timeout(s)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:230
+msgid "SNMP version"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:232
+msgid "SNMPv1"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:233
+msgid "SNMPv2c"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:234
+msgid "SNMPv3"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:219
+msgid "Serial Number"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid "Set USB serial port permissions"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:25
+msgid "Set variables"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:22
+msgid "Shutdown command"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:66
+msgid "Shutdown message"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33
+msgid "Slave"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Synchronous Communication"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:115
+msgid "The name of this section will be used as UPS name elsewhere"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Time in seconds between driver start retry attempts."
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Time in seconds that upsdrvctl will wait for driver to finish starting"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183
+msgid "UPS Master"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51
+msgid "UPS Server Global Settings"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212
+msgid "UPS Slave"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+msgid "UPS name"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:121
+msgid "USB Bus(es) (regex)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:209
+msgid "USB Product Id"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:241
+msgid "USB Vendor Id"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid ""
+"Use upscmd -l to see full list which the commands your UPS supports "
+"(requires upscmd package)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid ""
+"User as which to execute driver; requires device file accessed by driver to "
+"be read-write for that user."
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:205
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:234
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:16
+msgid "Username"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:238
+msgid "Vendor (regex)"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Verify all connection with SSL"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Workaround for buggy firmware"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:94
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:103
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:111
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:119
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:127
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:135
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:143
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:151
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:159
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:167
+msgid "Write to syslog"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "chroot"
+msgstr ""
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+msgid "upsmon drops privileges to this user"
+msgstr ""
diff --git a/applications/luci-app-nut/po/zh-cn/nut.po b/applications/luci-app-nut/po/zh-cn/nut.po
new file mode 100644
index 0000000000..8d8f71f873
--- /dev/null
+++ b/applications/luci-app-nut/po/zh-cn/nut.po
@@ -0,0 +1,602 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-04 00:24+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:216
+msgid "Additional Shutdown Time(s)"
+msgstr "é¢å¤–关机时间(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:37
+msgid "Addresses on which to listen"
+msgstr "è¦ç›‘å¬çš„地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:23
+msgid "Allowed actions"
+msgstr "å…许的动作"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "As configured by NUT"
+msgstr "ç”± NUT é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Bytes to read from interrupt pipe"
+msgstr "从中断管é“读å–的字节数"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "CA Certificate path"
+msgstr "CA è¯ä¹¦è·¯å¾„"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:73
+msgid "Certificate file (SSL)"
+msgstr "è¯ä¹¦æ–‡ä»¶ï¼ˆSSL)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:63
+msgid "Communications lost message"
+msgstr "通讯丢失消æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:60
+msgid "Communications restored message"
+msgstr "通讯æ¢å¤æ¶ˆæ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:35
+msgid "Control UPS via CGI"
+msgstr "通过 CGI 控制 UPS"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:43
+msgid "Deadtime"
+msgstr "æ— å应时间"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Default for UPSes without this field."
+msgstr "没有此字段的 UPS 的默认值。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Delay for kill power command"
+msgstr "断电åŽæ‰§è¡Œå‘½ä»¤çš„延时"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "Delay to power on UPS if power returns after kill power"
+msgstr "如果断电åŽç”µæºæ¢å¤ï¼Œåˆ™å»¶è¿Ÿå¼€å¯ UPS"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:129
+msgid "Description (Display)"
+msgstr "说明(显示)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:32
+msgid "Display name"
+msgstr "显示å称"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "Don't lock port when starting driver"
+msgstr "å¯åŠ¨é©±åŠ¨ç¨‹åºæ—¶ä¸è¦é”定端å£"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:132
+msgid "Driver"
+msgstr "驱动程åº"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:114
+msgid "Driver Configuration"
+msgstr "驱动程åºé…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:77
+msgid "Driver Global Settings"
+msgstr "驱动程åºå…¨å±€è®¾ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Driver Path"
+msgstr "驱动程åºè·¯å¾„"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:212
+msgid "Driver Shutdown Order"
+msgstr "驱动程åºå…³é—­é¡ºåº"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Driver waits for data to be consumed by upsd before publishing more."
+msgstr "在å‘布更多内容之å‰ï¼Œé©±åŠ¨ç¨‹åºä¼šç­‰å¾… upsd 处ç†å®Œæ•°æ®ã€‚"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+msgid "Drop privileges to this user"
+msgstr "é™ä½Žæƒé™è‡³æ­¤ç”¨æˆ·"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:40
+msgid "Enable"
+msgstr "å¯ç”¨"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid ""
+"Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) "
+"group read-write as user 'nut'"
+msgstr "å¯ç”¨çƒ­æ’拔脚本,使所有 ttyUSB 设备(例如串行 USB)组读写为用户“nutâ€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:93
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:102
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:110
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:118
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:126
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:134
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:142
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:150
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:158
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:166
+msgid "Execute notify command"
+msgstr "执行 notify 命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:26
+msgid "Forced Shutdown"
+msgstr "强制关机"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:57
+msgid "Forced shutdown message"
+msgstr "强制关机消æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:10
+msgid "Global Settings"
+msgstr "全局设置"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:13
+msgid "Go to NUT CGI"
+msgstr "å‰å¾€ NUT CGI"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:16
+msgid "Host"
+msgstr "主机"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:23
+msgid "Hostname or IP address"
+msgstr "主机å或 IP 地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:191
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:220
+msgid "Hostname or address of UPS"
+msgstr "UPS 的主机å或地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:39
+msgid "Hot Sync"
+msgstr "热åŒæ­¥"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:41
+msgid "IP Address"
+msgstr "IP 地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:95
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:104
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:112
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:120
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:128
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:136
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:144
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:152
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:160
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:168
+msgid "Ignore"
+msgstr "忽略"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:142
+msgid "Ignore Low Battery"
+msgstr "忽略低电é‡"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid "Instant commands"
+msgstr "å³æ—¶å‘½ä»¤"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:146
+msgid "Interrupt Only"
+msgstr "仅中断"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Interrupt Size"
+msgstr "中断大å°"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:54
+msgid "Low battery message"
+msgstr "电池电é‡ä½Ž"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:163
+msgid "Manufacturer (Display)"
+msgstr "制造商(展示)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:34
+msgid "Master"
+msgstr "主设备"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Max USB HID Length Reported"
+msgstr "报告的最大 USB HID 长度"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Maximum Age of Data"
+msgstr "最大数æ®å¹´é¾„"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Maximum Start Delay"
+msgstr "最大å¯åŠ¨å»¶è¿Ÿ"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:67
+msgid "Maximum connections"
+msgstr "最大连接数"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maximum number of times to try starting a driver."
+msgstr "å°è¯•å¯åŠ¨é©±åŠ¨ç¨‹åºçš„最大次数。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Maximum time in seconds between refresh of UPS status"
+msgstr "刷新 UPS 状æ€ä¹‹é—´çš„最长时间(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maxium Retries"
+msgstr "最大é‡è¯•æ¬¡æ•°"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Maxium Start Delay"
+msgstr "最大å¯åŠ¨å»¶è¿Ÿ"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:17
+msgid "Minimum required number or power supplies"
+msgstr "所需的最低数é‡æˆ–电æº"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:166
+msgid "Model (Display)"
+msgstr "åž‹å·ï¼ˆæ˜¾ç¤ºï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:9
+msgid "NUT CGI Access"
+msgstr "NUT CGI 访问"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:12
+msgid "NUT Users"
+msgstr "NUT 用户"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "Name of UPS"
+msgstr "UPS çš„å称"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:11
+msgid "Network UPS Tools"
+msgstr "网络 UPS 工具"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:22
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:6
+msgid "Network UPS Tools (CGI)"
+msgstr "网络 UPS 工具(CGI)"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:18
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:7
+msgid "Network UPS Tools (Monitor)"
+msgstr "网络 UPS 工具(监控)"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:9
+msgid "Network UPS Tools (Server)"
+msgstr "网络 UPS 工具(æœåŠ¡å™¨ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:7
+msgid "Network UPS Tools CGI Configuration"
+msgstr "网络 UPS 工具 CGI é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:8
+msgid "Network UPS Tools Monitoring Configuration"
+msgstr "网络 UPS 工具监控é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:10
+msgid "Network UPS Tools Server Configuration"
+msgstr "网络 UPS 工具æœåŠ¡å™¨é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "No Lock"
+msgstr "没有é”"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:72
+msgid "No communications message"
+msgstr "没有通讯信æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:173
+msgid "No low/high voltage transfer OIDs"
+msgstr "没有低压/高压传输 OID"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:75
+msgid "No parent message"
+msgstr "没有父信æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:90
+msgid "Notification defaults"
+msgstr "通知默认值"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:26
+msgid "Notify command"
+msgstr "通知命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:99
+msgid "Notify when back online"
+msgstr "é‡æ–°è”机时通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:163
+msgid "Notify when battery needs replacing"
+msgstr "电池需è¦æ›´æ¢æ—¶é€šçŸ¥"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:147
+msgid "Notify when communications lost"
+msgstr "通信丢失时通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:139
+msgid "Notify when communications restored"
+msgstr "通信æ¢å¤æ—¶é€šçŸ¥"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:131
+msgid "Notify when force shutdown"
+msgstr "强行关闭时通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:115
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:123
+msgid "Notify when low battery"
+msgstr "低电é‡æ—¶é€šçŸ¥"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:107
+msgid "Notify when on battery"
+msgstr "使用电池时通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:155
+msgid "Notify when shutting down"
+msgstr "关机时通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Off Delay(s)"
+msgstr "关闭延迟(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "On Delay(s)"
+msgstr "å¼€å¯å»¶è¿Ÿï¼ˆç§’)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:51
+msgid "On battery message"
+msgstr "å¼€å¯ç”µæ± æ¶ˆæ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:48
+msgid "Online message"
+msgstr "在线消æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:208
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:237
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:19
+msgid "Password"
+msgstr "密ç "
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "Path containing ca certificates to match against host certificate"
+msgstr "匹é…主机è¯ä¹¦çš„ ca è¯ä¹¦è·¯å¾„"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Path to drivers (instead of default)"
+msgstr "驱动程åºçš„路径(而ä¸æ˜¯é»˜è®¤ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:63
+msgid "Path to state file"
+msgstr "状æ€æ–‡ä»¶çš„路径"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Period after which data is considered stale"
+msgstr "æ•°æ®è¿‡æœŸæ—¶é—´"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Poll Interval"
+msgstr "轮询间隔"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:29
+msgid "Poll frequency"
+msgstr "轮询频率"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:34
+msgid "Poll frequency alert"
+msgstr "轮询频率警报"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197
+msgid "Polling Frequency(s)"
+msgstr "轮询频率(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:224
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:46
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:202
+msgid "Port"
+msgstr "端å£"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:200
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:229
+msgid "Power value"
+msgstr "功率值"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:206
+msgid "Product (regex)"
+msgstr "产å“(正则表达å¼ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:69
+msgid "Replace battery message"
+msgstr "替æ¢ç”µæ± æ¶ˆæ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Require SSL and make sure server CN matches hostname"
+msgstr "éœ€è¦ SSL 并确ä¿æœåŠ¡å™¨ CN 与主机å匹é…"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Retry Delay"
+msgstr "é‡è¯•å»¶è¿Ÿ"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:32
+msgid "Role"
+msgstr "角色"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "Run drivers in a chroot(2) environment"
+msgstr "在 chroot(2) 环境中è¿è¡Œé©±åŠ¨ç¨‹åº"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid "RunAs User"
+msgstr "RunAs 用户"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:125
+msgid "SNMP Community"
+msgstr "SNMP 社区"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:222
+msgid "SNMP retries"
+msgstr "SNMP é‡è¯•"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:226
+msgid "SNMP timeout(s)"
+msgstr "SNMP 超时"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:230
+msgid "SNMP version"
+msgstr "SNMP 版本"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:232
+msgid "SNMPv1"
+msgstr "SNMPv1"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:233
+msgid "SNMPv2c"
+msgstr "SNMPv2c"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:234
+msgid "SNMPv3"
+msgstr "SNMPv3"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:219
+msgid "Serial Number"
+msgstr "åºåˆ—å·"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid "Set USB serial port permissions"
+msgstr "设置 USB 串å£æƒé™"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:25
+msgid "Set variables"
+msgstr "设置å˜é‡"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:22
+msgid "Shutdown command"
+msgstr "关机命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:66
+msgid "Shutdown message"
+msgstr "关机消æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33
+msgid "Slave"
+msgstr "从设备"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Synchronous Communication"
+msgstr "åŒæ­¥é€šä¿¡"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:115
+msgid "The name of this section will be used as UPS name elsewhere"
+msgstr "此部分的å称将在其他地方用作 UPS å称"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Time in seconds between driver start retry attempts."
+msgstr "驱动程åºé‡è¯•ä¹‹é—´çš„间隔(秒)。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Time in seconds that upsdrvctl will wait for driver to finish starting"
+msgstr "upsdrvctl 等待驱动程åºå®Œæˆå¯åŠ¨çš„时间(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183
+msgid "UPS Master"
+msgstr "UPS 主设备"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51
+msgid "UPS Server Global Settings"
+msgstr "UPS æœåŠ¡å™¨å…¨å±€è®¾ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212
+msgid "UPS Slave"
+msgstr "UPS 从设备"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+msgid "UPS name"
+msgstr "UPS å称"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:121
+msgid "USB Bus(es) (regex)"
+msgstr "USB 总线(正则表达å¼ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:209
+msgid "USB Product Id"
+msgstr "USB äº§å“ ID"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:241
+msgid "USB Vendor Id"
+msgstr "USB 供应商 ID"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid ""
+"Use upscmd -l to see full list which the commands your UPS supports "
+"(requires upscmd package)"
+msgstr "使用 upscmd -l 查看 UPS 支æŒçš„å‘½ä»¤çš„å®Œæ•´åˆ—è¡¨ï¼ˆéœ€è¦ upscmd包)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid ""
+"User as which to execute driver; requires device file accessed by driver to "
+"be read-write for that user."
+msgstr "执行驱动程åºçš„用户;è¦æ±‚驱动程åºè®¿é—®çš„设备文件对该用户是å¯è¯»å†™çš„。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:205
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:234
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:16
+msgid "Username"
+msgstr "用户å"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:238
+msgid "Vendor (regex)"
+msgstr "供应商(正则表达å¼ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Verify all connection with SSL"
+msgstr "验è¯æ‰€æœ‰ SSL 连接"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Workaround for buggy firmware"
+msgstr "有缺陷的固件的解决方法"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:94
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:103
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:111
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:119
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:127
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:135
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:143
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:151
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:159
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:167
+msgid "Write to syslog"
+msgstr "写入 syslog"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "chroot"
+msgstr "chroot"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+msgid "upsmon drops privileges to this user"
+msgstr "upsmon 删除此用户的æƒé™"
diff --git a/applications/luci-app-nut/po/zh-tw/nut.po b/applications/luci-app-nut/po/zh-tw/nut.po
new file mode 100644
index 0000000000..33f0a0259d
--- /dev/null
+++ b/applications/luci-app-nut/po/zh-tw/nut.po
@@ -0,0 +1,602 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-04 00:24+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:216
+msgid "Additional Shutdown Time(s)"
+msgstr "é¡å¤–關機時間(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:37
+msgid "Addresses on which to listen"
+msgstr "è¦ç›£è½çš„地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:23
+msgid "Allowed actions"
+msgstr "å…許的動作"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "As configured by NUT"
+msgstr "ç”± NUT é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Bytes to read from interrupt pipe"
+msgstr "從中斷管é“讀å–çš„ä½å…ƒçµ„數"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "CA Certificate path"
+msgstr "CA 證書路徑"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:73
+msgid "Certificate file (SSL)"
+msgstr "證書檔案(SSL)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:63
+msgid "Communications lost message"
+msgstr "通訊丟失訊æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:60
+msgid "Communications restored message"
+msgstr "通訊æ¢å¾©è¨Šæ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:35
+msgid "Control UPS via CGI"
+msgstr "é€šéŽ CGI 控制 UPS"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:43
+msgid "Deadtime"
+msgstr "ç„¡å應時間"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Default for UPSes without this field."
+msgstr "沒有此欄ä½çš„ UPS çš„é è¨­å€¼ã€‚"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Delay for kill power command"
+msgstr "斷電後執行命令的延時"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "Delay to power on UPS if power returns after kill power"
+msgstr "如果斷電後電æºæ¢å¾©ï¼Œå‰‡å»¶é²é–‹å•Ÿ UPS"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:129
+msgid "Description (Display)"
+msgstr "說明(顯示)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:32
+msgid "Display name"
+msgstr "顯示å稱"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "Don't lock port when starting driver"
+msgstr "啟動驅動程å¼æ™‚ä¸è¦éŽ–定埠"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:132
+msgid "Driver"
+msgstr "驅動程å¼"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:114
+msgid "Driver Configuration"
+msgstr "驅動程å¼é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:77
+msgid "Driver Global Settings"
+msgstr "驅動程å¼å…¨åŸŸæ€§è¨­å®š"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Driver Path"
+msgstr "驅動程å¼è·¯å¾‘"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:212
+msgid "Driver Shutdown Order"
+msgstr "驅動程å¼é—œé–‰é †åº"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Driver waits for data to be consumed by upsd before publishing more."
+msgstr "在釋出更多內容之å‰ï¼Œé©…動程å¼æœƒç­‰å¾… upsd 處ç†å®Œè³‡æ–™ã€‚"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+msgid "Drop privileges to this user"
+msgstr "é™ä½Žè¨±å¯æ¬Šè‡³æ­¤ä½¿ç”¨è€…"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:40
+msgid "Enable"
+msgstr "啟用"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid ""
+"Enables a hotplug script that makes all ttyUSB devices (e.g. serial USB) "
+"group read-write as user 'nut'"
+msgstr "啟用熱æ’拔指令碼,使所有 ttyUSB è£ç½®ï¼ˆä¾‹å¦‚åºåˆ— USB)組讀寫為使用者“nutâ€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:93
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:102
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:110
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:118
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:126
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:134
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:142
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:150
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:158
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:166
+msgid "Execute notify command"
+msgstr "執行 notify 命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:26
+msgid "Forced Shutdown"
+msgstr "強制關機"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:57
+msgid "Forced shutdown message"
+msgstr "強制關機訊æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:10
+msgid "Global Settings"
+msgstr "全域性設定"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:13
+msgid "Go to NUT CGI"
+msgstr "å‰å¾€ NUT CGI"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:16
+msgid "Host"
+msgstr "主機"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:23
+msgid "Hostname or IP address"
+msgstr "主機å或 IP 地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:191
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:220
+msgid "Hostname or address of UPS"
+msgstr "UPS 的主機å或地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:39
+msgid "Hot Sync"
+msgstr "熱åŒæ­¥"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:41
+msgid "IP Address"
+msgstr "IP 地å€"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:95
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:104
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:112
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:120
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:128
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:136
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:144
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:152
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:160
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:168
+msgid "Ignore"
+msgstr "忽略"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:142
+msgid "Ignore Low Battery"
+msgstr "忽略低電é‡"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid "Instant commands"
+msgstr "å³æ™‚命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:146
+msgid "Interrupt Only"
+msgstr "僅中斷"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:150
+msgid "Interrupt Size"
+msgstr "中斷大å°"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:54
+msgid "Low battery message"
+msgstr "電池電é‡ä½Ž"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:163
+msgid "Manufacturer (Display)"
+msgstr "製造商(展示)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:34
+msgid "Master"
+msgstr "主è£ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Max USB HID Length Reported"
+msgstr "報告的最大 USB HID 長度"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Maximum Age of Data"
+msgstr "最大資料年齡"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:87
+msgid "Maximum Start Delay"
+msgstr "最大啟動延é²"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:67
+msgid "Maximum connections"
+msgstr "最大連線數"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maximum number of times to try starting a driver."
+msgstr "嘗試啟動驅動程å¼çš„最大次數。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Maximum time in seconds between refresh of UPS status"
+msgstr "é‡æ–°æ•´ç† UPS 狀態之間的最長時間(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:91
+msgid "Maxium Retries"
+msgstr "最大é‡è©¦æ¬¡æ•¸"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Maxium Start Delay"
+msgstr "最大啟動延é²"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:17
+msgid "Minimum required number or power supplies"
+msgstr "所需的最低數é‡æˆ–é›»æº"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:166
+msgid "Model (Display)"
+msgstr "型號(顯示)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:9
+msgid "NUT CGI Access"
+msgstr "NUT CGI 訪å•"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:12
+msgid "NUT Users"
+msgstr "NUT 使用者"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:188
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:217
+msgid "Name of UPS"
+msgstr "UPS çš„å稱"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:11
+msgid "Network UPS Tools"
+msgstr "網路 UPS 工具"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:22
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:6
+msgid "Network UPS Tools (CGI)"
+msgstr "網路 UPS 工具(CGI)"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:18
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:7
+msgid "Network UPS Tools (Monitor)"
+msgstr "網路 UPS 工具(監控)"
+
+#: applications/luci-app-nut/luasrc/controller/nut.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:9
+msgid "Network UPS Tools (Server)"
+msgstr "網路 UPS 工具(伺æœå™¨ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:7
+msgid "Network UPS Tools CGI Configuration"
+msgstr "網路 UPS 工具 CGI é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:8
+msgid "Network UPS Tools Monitoring Configuration"
+msgstr "網路 UPS 工具監控é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:10
+msgid "Network UPS Tools Server Configuration"
+msgstr "網路 UPS 工具伺æœå™¨é…ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:169
+msgid "No Lock"
+msgstr "沒有鎖"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:72
+msgid "No communications message"
+msgstr "沒有通訊資訊"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:173
+msgid "No low/high voltage transfer OIDs"
+msgstr "沒有低壓/高壓傳輸 OID"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:75
+msgid "No parent message"
+msgstr "沒有父資訊"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:90
+msgid "Notification defaults"
+msgstr "通知é è¨­å€¼"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:26
+msgid "Notify command"
+msgstr "通知命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:99
+msgid "Notify when back online"
+msgstr "é‡æ–°è¯æ©Ÿæ™‚通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:163
+msgid "Notify when battery needs replacing"
+msgstr "電池需è¦æ›´æ›æ™‚通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:147
+msgid "Notify when communications lost"
+msgstr "通訊丟失時通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:139
+msgid "Notify when communications restored"
+msgstr "通訊æ¢å¾©æ™‚通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:131
+msgid "Notify when force shutdown"
+msgstr "強行關閉時通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:115
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:123
+msgid "Notify when low battery"
+msgstr "低電é‡æ™‚通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:107
+msgid "Notify when on battery"
+msgstr "使用電池時通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:155
+msgid "Notify when shutting down"
+msgstr "關機時通知"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:177
+msgid "Off Delay(s)"
+msgstr "關閉延é²ï¼ˆç§’)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:181
+msgid "On Delay(s)"
+msgstr "開啟延é²ï¼ˆç§’)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:51
+msgid "On battery message"
+msgstr "開啟電池訊æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:48
+msgid "Online message"
+msgstr "在線訊æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:208
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:237
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:19
+msgid "Password"
+msgstr "密碼"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:174
+msgid "Path containing ca certificates to match against host certificate"
+msgstr "匹é…主機證書的 ca 證書路徑"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:83
+msgid "Path to drivers (instead of default)"
+msgstr "驅動程å¼çš„路徑(而ä¸æ˜¯é è¨­ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:63
+msgid "Path to state file"
+msgstr "狀態檔案的路徑"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:54
+msgid "Period after which data is considered stale"
+msgstr "資料éŽæœŸæ™‚é–“"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:101
+msgid "Poll Interval"
+msgstr "輪詢間隔"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:29
+msgid "Poll frequency"
+msgstr "輪詢頻率"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:34
+msgid "Poll frequency alert"
+msgstr "輪詢頻率警報"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:197
+msgid "Polling Frequency(s)"
+msgstr "輪詢頻率(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:27
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:195
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:224
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:46
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:202
+msgid "Port"
+msgstr "埠"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:200
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:229
+msgid "Power value"
+msgstr "功率值"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:206
+msgid "Product (regex)"
+msgstr "產å“(正則表示å¼ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:69
+msgid "Replace battery message"
+msgstr "替æ›é›»æ± è¨Šæ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Require SSL and make sure server CN matches hostname"
+msgstr "éœ€è¦ SSL 並確ä¿ä¼ºæœå™¨ CN 與主機å匹é…"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Retry Delay"
+msgstr "é‡è©¦å»¶é²"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:32
+msgid "Role"
+msgstr "角色"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "Run drivers in a chroot(2) environment"
+msgstr "在 chroot(2) 環境中執行驅動程å¼"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:59
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid "RunAs User"
+msgstr "RunAs 使用者"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:125
+msgid "SNMP Community"
+msgstr "SNMP 社群"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:222
+msgid "SNMP retries"
+msgstr "SNMP é‡è©¦"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:226
+msgid "SNMP timeout(s)"
+msgstr "SNMP 超時"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:230
+msgid "SNMP version"
+msgstr "SNMP 版本"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:232
+msgid "SNMPv1"
+msgstr "SNMPv1"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:233
+msgid "SNMPv2c"
+msgstr "SNMPv2c"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:234
+msgid "SNMPv3"
+msgstr "SNMPv3"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:219
+msgid "Serial Number"
+msgstr "åºåˆ—號"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:138
+msgid "Set USB serial port permissions"
+msgstr "設定 USB 串列埠許å¯æ¬Š"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:25
+msgid "Set variables"
+msgstr "設定變數"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:22
+msgid "Shutdown command"
+msgstr "關機命令"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:66
+msgid "Shutdown message"
+msgstr "關機訊æ¯"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:33
+msgid "Slave"
+msgstr "從è£ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:106
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:244
+msgid "Synchronous Communication"
+msgstr "åŒæ­¥é€šè¨Š"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:115
+msgid "The name of this section will be used as UPS name elsewhere"
+msgstr "此部分的å稱將在其他地方用作 UPS å稱"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:96
+msgid "Time in seconds between driver start retry attempts."
+msgstr "驅動程å¼é‡è©¦ä¹‹é–“的間隔(秒)。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:158
+msgid "Time in seconds that upsdrvctl will wait for driver to finish starting"
+msgstr "upsdrvctl 等待驅動程å¼å®Œæˆå•Ÿå‹•çš„時間(秒)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:183
+msgid "UPS Master"
+msgstr "UPS 主è£ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:51
+msgid "UPS Server Global Settings"
+msgstr "UPS 伺æœå™¨å…¨åŸŸæ€§è¨­å®š"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:212
+msgid "UPS Slave"
+msgstr "UPS 從è£ç½®"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua:20
+msgid "UPS name"
+msgstr "UPS å稱"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:121
+msgid "USB Bus(es) (regex)"
+msgstr "USB 匯æµæŽ’(正則表示å¼ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:209
+msgid "USB Product Id"
+msgstr "USB ç”¢å“ ID"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:241
+msgid "USB Vendor Id"
+msgstr "USB 供應商 ID"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:29
+msgid ""
+"Use upscmd -l to see full list which the commands your UPS supports "
+"(requires upscmd package)"
+msgstr "使用 upscmd -l 檢視 UPS 支æ´çš„å‘½ä»¤çš„å®Œæ•´åˆ—è¡¨ï¼ˆéœ€è¦ upscmd包)"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:110
+msgid ""
+"User as which to execute driver; requires device file accessed by driver to "
+"be read-write for that user."
+msgstr "執行驅動程å¼çš„使用者;è¦æ±‚驅動程å¼è¨ªå•çš„è£ç½®æª”案å°è©²ä½¿ç”¨è€…是å¯è®€å¯«çš„。"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:205
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:234
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:16
+msgid "Username"
+msgstr "使用者å稱"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:238
+msgid "Vendor (regex)"
+msgstr "供應商(正則表示å¼ï¼‰"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:178
+msgid "Verify all connection with SSL"
+msgstr "驗證所有 SSL 連線"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:154
+msgid "Workaround for buggy firmware"
+msgstr "有缺陷的韌體的解決方法"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:94
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:103
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:111
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:119
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:127
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:135
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:143
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:151
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:159
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:167
+msgid "Write to syslog"
+msgstr "寫入 syslog"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_server.lua:80
+msgid "chroot"
+msgstr "chroot"
+
+#: applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua:14
+msgid "upsmon drops privileges to this user"
+msgstr "upsmon 刪除此使用者的許å¯æ¬Š"
diff --git a/applications/luci-app-olsr/po/zh-cn/olsr.po b/applications/luci-app-olsr/po/zh-cn/olsr.po
index 60e4b3cd67..594a2fb359 100644
--- a/applications/luci-app-olsr/po/zh-cn/olsr.po
+++ b/applications/luci-app-olsr/po/zh-cn/olsr.po
@@ -1,10 +1,10 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2018, 2019.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2018-10-01 11:10+0800\n"
+"PO-Revision-Date: 2019-01-10 15:44+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -136,7 +136,7 @@ msgstr ""
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:36
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:36
msgid "Enable this interface."
-msgstr "å¯ç”¨è¿™ä¸ªç«¯å£"
+msgstr "å¯ç”¨è¿™ä¸ªæŽ¥å£"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:249
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua:249
@@ -162,7 +162,7 @@ msgid ""
"value too, but does only update the hopcount if the nexthop changes too. "
"Default is \"flat\"."
msgstr ""
-"FIBMetric 控制主机路由 OLSRd 集的度é‡æ ‡å‡†å€¼ã€‚“flatâ€è¡¨ç¤ºåº¦é‡å€¼å§‹ç»ˆä¸º2。这是首"
+"FIBMetric 控制主机路由 OLSRd 集的度é‡æ ‡å‡†å€¼ã€‚“flatâ€è¡¨ç¤ºåº¦é‡å€¼å§‹ç»ˆä¸º 2。这是首"
"选值,因为它有助于 linux 内核清ç†æ—§è·¯ç”±ã€‚“correctâ€ä½¿ç”¨ hopcount 作为度é‡"
"值。“approxâ€ä¹Ÿä½¿ç”¨ hopcount 作为度é‡å€¼ï¼Œä½†åªæœ‰åœ¨ä¸‹ä¸€æ¬¡æ›´æ”¹æ—¶æ‰æ›´æ–° hopcount。"
"默认为“flatâ€ã€‚"
@@ -409,8 +409,8 @@ msgid ""
"with the etx_ffeth metric!<br />Defaults to \"1.0\"."
msgstr ""
"如果è¦æ›´æ”¹åˆ°å½“å‰ç½‘关的路由,则在将该网关与新网关进行比较之å‰ï¼Œå°†è¯¥ç½‘关的ETX值"
-"乘以该值。å‚æ•°å¯ä»¥æ˜¯ä»‹äºŽ0.1å’Œ1.0之间的值,但如果更改则应接近1.0。<br /><b>è­¦"
-"告:</b>æ­¤å‚æ•°ä¸åº”与etx_ffeth指标一起使用ï¼<br />默认值到“1.0â€ã€‚"
+"乘以该值。å‚æ•°å¯ä»¥æ˜¯ä»‹äºŽ 0.1 å’Œ 1.0 之间的值,但如果更改则应接近 1.0。<br /"
+"><b>警告:</b>æ­¤å‚æ•°ä¸åº”与 etx_ffeth 指标一起使用ï¼<br />默认值到“1.0â€ã€‚"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:166
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:160
@@ -469,7 +469,7 @@ msgstr "轮询网络接å£ä»¥è¿›è¡Œé…置更改的间隔(秒)。默认值为
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:93
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:93
msgid "Invalid Value for LQMult-Value. Must be between 0.01 and 1.0."
-msgstr "LQMult-Value 的值无效。必须介于0.01和1.0之间。"
+msgstr "LQMult-Value 的值无效。必须介于 0.01 和 1.0 之间。"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:271
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:265
@@ -478,7 +478,8 @@ msgstr "LQMult-Value 的值无效。必须介于0.01和1.0之间。"
msgid ""
"Invalid Value for LQMult-Value. You must use a decimal number between 0.01 "
"and 1.0 here."
-msgstr "LQMult-Value 的值无效。您必须在此处使用介于0.01å’Œ1.0之间的å进制数。"
+msgstr ""
+"LQMult-Value 的值无效。您必须在此处使用介于 0.01 å’Œ 1.0 之间的å进制数。"
#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:98
msgid "Known OLSR routes"
@@ -544,8 +545,8 @@ msgid ""
"etx_float and etx_fpm, smaller values mean slower changes of ETX value. "
"(allowed values are between 0.01 and 1.0)"
msgstr ""
-"链路质é‡è€åŒ–å› å­ï¼ˆä»…适用于 lq 级别2)。调整 etx_float å’Œ etx_fpm çš„å‚数,值越"
-"å°æ„å‘³ç€ ETX 值的å˜åŒ–越慢。(å…许值介于0.01å’Œ1.0之间)"
+"链路质é‡è€åŒ–å› å­ï¼ˆä»…适用于 lq 级别 2)。调整 etx_float å’Œ etx_fpm çš„å‚数,值"
+"越å°æ„å‘³ç€ ETX 值的å˜åŒ–越慢。(å…许值介于 0.01 å’Œ 1.0 之间)"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:97
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:91
@@ -557,11 +558,11 @@ msgid ""
"calculation<br /><b>etx_ffeth</b>: incompatible variant of etx_ff that "
"allows ethernet links with ETX 0.1.<br />Defaults to \"etx_ff\""
msgstr ""
-"链路质é‡ç®—法(仅适用于 lq 级别2)。<br /><b>etx_float</b>:浮点数 ETX,按指数"
-"函数è€åŒ–<br /><b>etx_fpm</b>:与etx_float 相åŒï¼Œä½†æŒ‰æ•´æ•°ç®—术<br /><b>etx_ff</"
-"b>:ETX freifunk,一ç§ä½¿ç”¨æ‰€æœ‰ OLSR æµé‡ï¼ˆè€Œä¸ä»…仅是 hello)进行 ETX 计算的 "
-"etx å˜ä½“<br /><b>etx_ffeth</b>:ä¸å…¼å®¹çš„å˜ä½“ etx_ff,å…许以太网链接使用 ETX "
-"0.1。<br />默认为“etx_ffâ€"
+"链路质é‡ç®—法(仅适用于 lq 级别 2)。<br /><b>etx_float</b>:浮点数 ETX,按指"
+"数函数è€åŒ–<br /><b>etx_fpm</b>:与 etx_float 相åŒï¼Œä½†æŒ‰æ•´æ•°è¿ç®—<br /"
+"><b>etx_ff</b>:ETX freifunk,一ç§ä½¿ç”¨æ‰€æœ‰ OLSR æµé‡ï¼ˆè€Œä¸ä»…仅是 hello)进行 "
+"ETX 计算的 etx å˜ä½“<br /><b>etx_ffeth</b>:ä¸å…¼å®¹çš„å˜ä½“ etx_ff,å…许以太网链"
+"接使用 ETX 0.1。<br />默认为“etx_ffâ€"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:83
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:77
@@ -628,7 +629,7 @@ msgid ""
"Make sure that OLSRd is running, the \"jsoninfo\" plugin is loaded, "
"configured on port 9090 and accepts connections from \"127.0.0.1\"."
msgstr ""
-"ç¡®ä¿ OLSRd 正在è¿è¡Œï¼ŒåŠ è½½äº†â€œjsoninfoâ€æ’件,在端å£9090上é…置接å—æ¥"
+"ç¡®ä¿ OLSRd 正在è¿è¡Œï¼ŒåŠ è½½äº†â€œjsoninfoâ€æ’ä»¶ï¼Œåœ¨ç«¯å£ 9090 上é…置接å—æ¥"
"自“127.0.0.1â€çš„连接。"
#: applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm:50
@@ -653,9 +654,9 @@ msgid ""
">reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5<br />reduce LQ to all "
"nodes on this interface by 20%: default 0.8"
msgstr ""
-"使用此处给出的因å­æ”¾å¤§è·¯ç”± LQ。å…许值介于0.01å’Œ1.0之间。它仅在 LQ-Level 大于0"
-"时使用。示例:<br />将到 192.168.0.1 çš„ LQ å‡åŠï¼š192.168.0.1 0.5<br />将此接"
-"å£åˆ°æ‰€æœ‰èŠ‚点的 LQ å‡å°‘20%:default 0.8"
+"使用此处给出的因å­æ”¾å¤§è·¯ç”± LQ。å…许值介于 0.01 å’Œ 1.0 之间。它仅在 LQ-Level "
+"大于 0 时使用。示例:<br />将到 192.168.0.1 çš„ LQ å‡åŠï¼š192.168.0.1 0.5<br />"
+"将此接å£åˆ°æ‰€æœ‰èŠ‚点的 LQ å‡å°‘ 20%:默认 0.8"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:240
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:71
@@ -665,9 +666,9 @@ msgid ""
">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
"LQ to all nodes on this interface by 20%: default 0.8"
msgstr ""
-"使用此处给出的因å­æ”¾å¤§è·¯ç”± LQ。å…许值介于0.01å’Œ1.0之间。它仅在 LQ-Level 大于0"
-"时使用。示例:<br />将到 fd91:662e:3c58::1 çš„ LQ å‡åŠï¼šfd91:662e:3c58::1 "
-"0.5<br />将此接å£åˆ°æ‰€æœ‰èŠ‚点的 LQ å‡å°‘20%:default 0.8"
+"使用此处给出的因å­æ”¾å¤§è·¯ç”± LQ。å…许值介于 0.01 å’Œ 1.0 之间。它仅在 LQ-Level "
+"大于 0 时使用。示例:<br />将到 fd91:662e:3c58::1 çš„ LQ å‡åŠï¼š"
+"fd91:662e:3c58::1 0.5<br />将此接å£åˆ°æ‰€æœ‰èŠ‚点的 LQ å‡å°‘ 20%:默认 0.8"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:201
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:195
@@ -725,7 +726,7 @@ msgstr "OLSR"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua:4
msgid "OLSR - Display Options"
-msgstr "OLSR - 显示选项"
+msgstr "OLSR - 显示选项"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua:8
msgid "OLSR - HNA-Announcements"
@@ -821,7 +822,7 @@ msgstr "æ’件"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:54
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:48
msgid "Polling rate for OLSR sockets in seconds. Default is 0.05."
-msgstr "OLSR 套接字的轮询速率,以秒为å•ä½ã€‚默认值为0.05。"
+msgstr "OLSR 套接字的轮询速率,以秒为å•ä½ã€‚默认值为 0.05。"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:53
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:47
@@ -869,7 +870,7 @@ msgstr "辅助 OLSR 接å£"
#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:56
#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:108
msgid "Selected"
-msgstr ""
+msgstr "已选择"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:133
msgid ""
@@ -1013,8 +1014,8 @@ msgid ""
"The port OLSR uses. This should usually stay at the IANA assigned port 698. "
"It can have a value between 1 and 65535."
msgstr ""
-"OLSR 使用的端å£ã€‚通常应使用 IANA 分é…çš„ä¿ç•™ç«¯å£698。它的值å¯ä»¥åœ¨1到65535之"
-"间。"
+"OLSR 使用的端å£ã€‚通常应使用 IANA 分é…çš„ä¿ç•™ç«¯å£ 698。它的值å¯ä»¥åœ¨ 1 到 65535 "
+"之间。"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:184
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:178
@@ -1025,8 +1026,8 @@ msgid ""
"length is 64 bits. Default is \"::/0\" (no prefix)."
msgstr ""
"è¿™å¯ç”¨äºŽå‘客户端通知上行链路的外部 IPv6 å‰ç¼€ã€‚è¿™å¯èƒ½å¯ä½¿å®¢æˆ·ç«¯æ›´æ”¹å…¶æœ¬åœ° "
-"IPv6 地å€ï¼Œä»¥ä½¿ç”¨ IPv6 网关,而无需任何类型的地å€è½¬æ¢ã€‚å‰ç¼€é•¿åº¦æœ€å¤§ä¸º64ä½ã€‚默"
-"认为“::/0â€ï¼ˆæ— å‰ç¼€ï¼‰ã€‚"
+"IPv6 地å€ï¼Œä»¥ä½¿ç”¨ IPv6 网关,而无需任何类型的地å€è½¬æ¢ã€‚å‰ç¼€é•¿åº¦æœ€å¤§ä¸º 64 ä½ã€‚"
+"默认为“::/0â€ï¼ˆæ— å‰ç¼€ï¼‰ã€‚"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:224
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:218
@@ -1100,7 +1101,7 @@ msgstr ""
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:60
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:60
msgid "Weight"
-msgstr "体é‡"
+msgstr "æƒé‡"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:236
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:230
@@ -1117,7 +1118,7 @@ msgid ""
msgstr ""
"当主机之间存在多个链路时,接å£æƒé‡ç”¨äºŽç¡®å®šè¦ä½¿ç”¨çš„链路。通常,æƒé‡ç”± olsrd æ ¹"
"æ®æŽ¥å£çš„特性自动计算,但您å¯ä»¥åœ¨æ­¤å¤„指定固定值。Olsrd 将选择值最低的链接。"
-"<br /><b>注æ„:</b>仅当 LinkQualityLevel 设置为0æ—¶æ‰ä½¿ç”¨æŽ¥å£æƒé‡ã€‚"
+"<br /><b>注æ„:</b>仅当 LinkQualityLevel 设置为 0 æ—¶æ‰ä½¿ç”¨æŽ¥å£æƒé‡ã€‚"
"LinkQualityLevel 的任何其他值都将使用接å£çš„ ETX 值。"
#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:155
@@ -1150,7 +1151,7 @@ msgstr "黄色"
#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
msgid "down"
-msgstr ""
+msgstr "å‘上"
#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:30
#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:134
@@ -1169,7 +1170,7 @@ msgstr "å¦"
#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
msgid "up"
-msgstr ""
+msgstr "å‘下"
#: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:40
#: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:29
diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
index 274a982929..4a36b0a3c3 100644
--- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
+++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js
@@ -135,7 +135,7 @@ function display(pattern)
if (currentDisplayMode === 'updates') {
var avail = packages.available.pkgs[name];
- if (!avail || avail.version === pkg.version)
+ if (!avail || compareVersion(avail.version, pkg.version) <= 0)
continue;
ver = '%s » %s'.format(
@@ -291,6 +291,9 @@ function compareVersion(val, ref)
val = val || '';
ref = ref || '';
+ if (val === ref)
+ return 0;
+
while (vi < val.length || ri < ref.length) {
var first_diff = 0;
diff --git a/applications/luci-app-opkg/po/pl/opkg.po b/applications/luci-app-opkg/po/pl/opkg.po
index 4b0f729a5c..3d1d619bf8 100644
--- a/applications/luci-app-opkg/po/pl/opkg.po
+++ b/applications/luci-app-opkg/po/pl/opkg.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: LuCI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-20 09:40+0200\n"
-"PO-Revision-Date: 2018-09-02 15:25+0200\n"
+"PO-Revision-Date: 2019-01-05 19:35+0200\n"
"Last-Translator: Rixerx <krystian.kozak20@gmail.com>\n"
"Language-Team: Polish\n"
"Language: pl\n"
@@ -20,7 +20,7 @@ msgstr "Akcje"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:710
msgid "Automatically remove unused dependencies"
-msgstr ""
+msgstr "Automatycznie usuwaj nieużywane zależności"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:115
msgid "Available"
@@ -33,6 +33,10 @@ msgid ""
"custom repository entries. The configuration in the other files may be "
"changed but is usually not preserved by <em>sysupgrade</em>."
msgstr ""
+"Poniżej znajduje się lista różnych plików konfiguracyjnych używanych przez <em>opkg</em>. "
+"Użyj <em>opkg.conf</em> dla ustawień globalnych i <em>customfeeds.conf</em> dla "
+"niestandardowych wpisów w repozytorium. Konfiguracja w innych plikach może zostać "
+"zmieniona, ale zwykle nie jest zachowywana przez <em>sysupgrade</em>."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:582
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:627
@@ -43,16 +47,16 @@ msgstr "Anuluj"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:97
msgid "Clear"
-msgstr ""
+msgstr "Wyczyść"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:110
#, fuzzy
msgid "Configure opkg…"
-msgstr "Konfiguracja"
+msgstr "Konfiguruj opkg…"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:559
msgid "Dependencies"
-msgstr ""
+msgstr "Zależności"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:565
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:696
@@ -62,15 +66,15 @@ msgstr "Opis"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:570
msgid "Details for package <em>%h</em>"
-msgstr ""
+msgstr "Szczegóły pakietu <em>%h</em>"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:762
msgid "Dismiss"
-msgstr ""
+msgstr "Odrzuć"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:227
msgid "Displaying %d-%d of %d"
-msgstr ""
+msgstr "Wyświetlanie %d-%d z %d"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:101
msgid "Download and install package"
@@ -83,7 +87,7 @@ msgstr "BÅ‚Ä…d"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:736
msgid "Executing package manager"
-msgstr ""
+msgstr "Wykonywanie menedżera pakietów"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:95
msgid "Filter"
@@ -103,32 +107,34 @@ msgstr "Instaluj"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:116
#, fuzzy
msgid "Installed"
-msgstr "Instaluj"
+msgstr "Zainstalowane"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:611
msgid ""
"Installing packages from untrusted sources is a potential security risk! "
"Really attempt to install <em>%h</em>?"
msgstr ""
+"Instalowanie pakietów z niezaufanych źródeł jest potencjalnym zagrożeniem "
+"bezpieczeństwa! Czy na pewno chcesz zainstalować pakiet <em>%h</em>?"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:167
#, fuzzy
msgid "Install…"
-msgstr "Instaluj"
+msgstr "Instaluj…"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:636
#, fuzzy
msgid "Loading configuration data…"
-msgstr "Zatwierdzanie konfiguracji…"
+msgstr "Åadowanie danych konfiguracyjnych…"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:769
msgid "Loading package information…"
-msgstr ""
+msgstr "Åadowanie informacji o pakiecie…"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:621
#, fuzzy
msgid "Manually install package"
-msgstr "Pobierz i zainstaluj pakiet"
+msgstr "Zainstaluj ręcznie pakiet"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:374
#, fuzzy
@@ -137,7 +143,7 @@ msgstr "WymuÅ› uaktualnienie"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:124
msgid "Next page"
-msgstr ""
+msgstr "Następna strona"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:240
msgid "No information available"
@@ -146,21 +152,21 @@ msgstr "Brak dostępnych informacji"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:228
#, fuzzy
msgid "No packages"
-msgstr "Znajdź pakiet"
+msgstr "Brak pakietów"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:244
msgid "No packages matching \"<strong>%h</strong>\"."
-msgstr ""
+msgstr "Brak pasujących pakietów \"<strong>%h</strong>\"."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:406
#, fuzzy
msgid "Not available"
-msgstr "Całkowicie dostępna"
+msgstr "Niedostępne"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:391
#, fuzzy
msgid "Not installed"
-msgstr "Nie podłączony"
+msgstr "Nie zainstalowany"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:103
msgid "OK"
@@ -180,15 +186,15 @@ msgstr "Nazwa pakietu"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:102
#, fuzzy
msgid "Package name or URL…"
-msgstr "Nazwa pakietu"
+msgstr "Nazwa pakietu lub URL…"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:122
msgid "Previous page"
-msgstr ""
+msgstr "Poprzednia strona"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:618
msgid "Really attempt to install <em>%h</em>?"
-msgstr ""
+msgstr "Czy na pewno chcesz zainstalować pakiet <em>%h</em>?"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:157
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:723
@@ -197,11 +203,11 @@ msgstr "Usuń"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:701
msgid "Remove package <em>%h</em>"
-msgstr ""
+msgstr "Usuń pakiet <em>%h</em>"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:555
msgid "Require approx. %.1024mB size for %d package(s) to install."
-msgstr ""
+msgstr "Wymaga ok. %.1024mB rozmiaru pakietu %d do zainstalowania."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:381
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:399
@@ -209,15 +215,18 @@ msgid ""
"Require version %h %h,\n"
"installed %h"
msgstr ""
+"Wymaga wersji %h %h,\n"
+"zainstalowanej %h"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:404
msgid ""
"Required dependency package <em>%h</em> is not available in any repository."
msgstr ""
+"Wymagana zależność <em>%h</em> nie jest dostępna w żadnym repozytorium."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:372
msgid "Requires update to %h %h"
-msgstr ""
+msgstr "Wymaga aktualizacji do %h %h"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:245
msgid "Reset"
@@ -248,42 +257,46 @@ msgstr "Oprogramowanie"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:753
msgid "The <em>opkg %h</em> command failed with code <code>%d</code>."
-msgstr ""
+msgstr "Polecenie <em>opkg %h</em> zakończyło się niepomyślnie z kodem <code>%d</code>."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:377
msgid ""
"The installed version of package <em>%h</em> is not compatible, require %s "
"while %s is installed."
msgstr ""
+"Zainstalowana wersja pakietu <em>%h</em> nie jest zgodna, wymaga %s "
+"podczas gdy %s jest już zainstalowana."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:614
msgid "The package <em>%h</em> is not available in any configured repository."
-msgstr ""
+msgstr "Pakiet <em>%h</em> nie jest dostępny w żadnym skonfigurowanym repozytorium."
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:394
msgid ""
"The repository version of package <em>%h</em> is not compatible, require %s "
"but only %s is available."
msgstr ""
+"Wersja pakietu w repozytorium <em>%h</em> nie jest zgodna, wymaga %s "
+"ale tylko %s jest dostępna."
#: applications/luci-app-opkg/luasrc/view/opkg.htm:96
msgid "Type to filter…"
-msgstr ""
+msgstr "Wpisz, by przefiltrować…"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:108
#, fuzzy
msgid "Update lists…"
-msgstr "Aktualizuj listy"
+msgstr "Aktualizuj listy…"
#: applications/luci-app-opkg/luasrc/view/opkg.htm:117
#, fuzzy
msgid "Updates"
-msgstr "Aktualizuj listy"
+msgstr "Aktualizacje"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:149
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:173
msgid "Upgrade…"
-msgstr ""
+msgstr "Zaktualizuj…"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:572
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:703
@@ -294,12 +307,12 @@ msgstr "Wersja"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:383
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:401
msgid "Version incompatible"
-msgstr ""
+msgstr "Wersja niekompatybilna"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:738
#, fuzzy
msgid "Waiting for the <em>opkg %h</em> command to complete…"
-msgstr "Trwa wykonanie polecenia..."
+msgstr "Oczekiwanie na wykonanie polecenia <em>opkg %h</em>…"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:533
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:692
@@ -310,9 +323,9 @@ msgstr "nieznane"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:531
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:690
msgid "~%.1024mB compressed"
-msgstr ""
+msgstr "~%.1024mB skompresowany"
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:529
#: applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js:688
msgid "~%.1024mB installed"
-msgstr ""
+msgstr "~%.1024mB zainstalowany"
diff --git a/applications/luci-app-privoxy/po/zh-cn/privoxy.po b/applications/luci-app-privoxy/po/zh-cn/privoxy.po
index 1efdc70693..9cc602181a 100644
--- a/applications/luci-app-privoxy/po/zh-cn/privoxy.po
+++ b/applications/luci-app-privoxy/po/zh-cn/privoxy.po
@@ -1,29 +1,32 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
msgid ""
msgstr ""
"Project-Id-Version: luci-app-privoxy\n"
"POT-Creation-Date: 2015-06-10 20:16+0100\n"
-"PO-Revision-Date: 2017-01-05 18:01+0800\n"
-"Last-Translator: maz-1 <ohmygod19993 at gmail dotcom>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2019-01-03 22:42+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-SourceCharset: UTF-8\n"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:236
msgid ""
"A URL to be displayed in the error page that users will see if access to an "
"untrusted page is denied."
-msgstr "当用户试图访问ä¸å—信任的页é¢æ—¶ï¼Œé”™è¯¯é¡µé¢æ‰€æ˜¾ç¤ºçš„URL。"
+msgstr "当用户试图访问ä¸å—信任的页é¢æ—¶ï¼Œé”™è¯¯é¡µé¢æ‰€æ˜¾ç¤ºçš„ URL。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:226
msgid ""
"A URL to documentation about the local Privoxy setup, configuration or "
"policies."
-msgstr "æŒ‡å‘ Privoxy 安装ã€è®¾ç½®å’Œè§„则说明文档的 URL"
+msgstr "æŒ‡å‘ Privoxy 安装ã€è®¾ç½®å’Œè§„则说明文档的 URL。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:325
msgid "A directory where Privoxy can create temporary files."
@@ -75,19 +78,19 @@ msgstr ""
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:851
msgid "Debug GIF de-animation"
-msgstr "GIF动画日志"
+msgstr "调试 GIF 动画"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:833
msgid "Debug force feature"
-msgstr "Force feature 日志"
+msgstr "调试 Force feature"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:845
msgid "Debug redirects"
-msgstr "é‡å®šå‘日志"
+msgstr "调试é‡å®šå‘"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:839
msgid "Debug regular expression filters"
-msgstr "正则表达å¼æ—¥å¿—"
+msgstr "调试正则表达å¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:152
msgid "Delay (in seconds) during system boot before Privoxy start"
@@ -119,15 +122,15 @@ msgstr "å…许转å‘代ç†è®¤è¯"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:135
msgid ""
"Enable/Disable autostart of Privoxy on system startup and interface events"
-msgstr "å¼€å¯/关闭 Privoxy 在系统å¯åŠ¨æˆ–接å£äº‹ä»¶æ—¶è‡ªåŠ¨å¯åŠ¨ã€‚"
+msgstr "å¯ç”¨/ç¦ç”¨ Privoxy 在系统å¯åŠ¨æˆ–接å£äº‹ä»¶æ—¶è‡ªåŠ¨å¯åŠ¨"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:555
msgid "Enable/Disable filtering when Privoxy starts."
-msgstr "Privoxy å¯åŠ¨æ—¶å¼€å¯/关闭过滤。"
+msgstr "Privoxy å¯åŠ¨æ—¶å¯ç”¨/ç¦ç”¨è¿‡æ»¤ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:134
msgid "Enabled"
-msgstr "已开å¯"
+msgstr "å·²å¯ç”¨"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:602
msgid ""
@@ -139,7 +142,7 @@ msgstr "如果没有需è¦è®¤è¯çš„父级代ç†æ—¶ï¼Œä¸æŽ¨èå¼€å¯è¿™ä¸ªé€‰é¡¹
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:404
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:442
msgid "File '%s' not found inside Configuration Directory"
-msgstr "在设置目录中未找到文件 '%S'ï¼"
+msgstr "在设置目录中未找到文件“%sâ€"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:915
#: applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm:12
@@ -153,7 +156,7 @@ msgstr "文件和目录"
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:36
msgid "For help use link at the relevant option"
-msgstr "点击相应选项的连接å¯èŽ·å–帮助。"
+msgstr "点击相应选项的连接å¯èŽ·å–帮助"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:91
msgid "Forwarding"
@@ -163,7 +166,7 @@ msgstr "转å‘"
msgid ""
"If enabled, Privoxy hides the 'go there anyway' link. The user obviously "
"should not be able to bypass any blocks."
-msgstr "如果å¯ç”¨ï¼ŒPrivoxy 会éšè— 'go there anyway' 链接,用户就ä¸èƒ½ç»•è¿‡å±è”½ã€‚"
+msgstr "如果å¯ç”¨ï¼ŒPrivoxy 会éšè—“go there anywayâ€é“¾æŽ¥ï¼Œç”¨æˆ·å°±ä¸èƒ½ç»•è¿‡å±è”½ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:67
msgid ""
@@ -184,7 +187,7 @@ msgstr "ä¸æŽ¨è新手使用。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:194
msgid "Location of the Privoxy User Manual."
-msgstr "Privoxy 用户手册ä½ç½®"
+msgstr "Privoxy 用户手册ä½ç½®ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:108
msgid "Log File Viewer"
@@ -206,7 +209,7 @@ msgstr "记录é…ç½®ä¿å­˜åŠ¨ä½œ"
msgid ""
"Log the destination for each request Privoxy let through. See also 'Debug "
"1024'."
-msgstr "记录 Privoxy å…许的所有请求。å¦è¯·å‚考 'Debug 1024'。"
+msgstr "记录 Privoxy å…许的所有请求。å¦è¯·å‚考“Debug 1024â€ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:863
msgid ""
@@ -224,38 +227,38 @@ msgstr "主è¦è§„则文件"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:461
msgid "Mandatory Input: No Data given!"
-msgstr "必需选项: 没有设置数æ®ï¼"
+msgstr "必需选项:没有设置数æ®ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:259
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:296
msgid "Mandatory Input: No Directory given!"
-msgstr "必需选项: 没有设置目录ï¼"
+msgstr "必需选项:没有设置目录ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:279
msgid "Mandatory Input: No File given!"
-msgstr "必需选项: 没有设置文件ï¼"
+msgstr "必需选项:没有设置文件ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:479
msgid "Mandatory Input: No Port given!"
-msgstr "必需选项: 没有设置端å£ï¼"
+msgstr "必需选项:没有设置端å£ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:345
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:381
msgid "Mandatory Input: No files given!"
-msgstr "必需选项: 没有设置文件ï¼"
+msgstr "必需选项:没有设置文件ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:482
msgid "Mandatory Input: No valid IPv4 address or host given!"
-msgstr "必需选项: 没有设置有效的IPV4地å€æˆ–者主机ï¼"
+msgstr "必需选项:没有设置有效的 IPv4 地å€æˆ–者主机ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:470
msgid "Mandatory Input: No valid IPv6 address given!"
-msgstr "必需选项: 没有设置有效的IPV6地å€ï¼"
+msgstr "必需选项:没有设置有效的 IPv6 地å€ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:472
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:484
msgid "Mandatory Input: No valid Port given!"
-msgstr "必需选项: 没有设置有效的端å£ï¼"
+msgstr "必需选项:没有设置有效的端å£ï¼"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:733
msgid "Maximum number of client connections that will be served."
@@ -278,11 +281,11 @@ msgstr "未安装"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:291
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:310
msgid "No trailing '/', please."
-msgstr "路径结尾ä¸è¦åŠ  '/' 。"
+msgstr "路径结尾ä¸è¦åŠ â€œ/â€ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:881
msgid "Non-fatal errors - *we highly recommended enabling this*"
-msgstr "éžè‡´å‘½æ€§é”™è¯¯ - * å¼ºçƒˆå»ºè®®å¼€å¯ *"
+msgstr "éžè‡´å‘½æ€§é”™è¯¯ - *强烈建议å¯ç”¨*"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:714
msgid ""
@@ -326,8 +329,8 @@ msgid ""
"configuration, help and logging. This section of the configuration file "
"tells Privoxy where to find those other files."
msgstr ""
-"Privoxy å¯ä»¥ä½¿ç”¨å…¶ä»–一些文件用于附加设置,帮助和日志。这个区域用æ¥å‘Šè¯‰ "
-"Privoxy 从哪里找到这些文件。"
+"Privoxy å¯ä»¥ï¼ˆè€Œä¸”一般都会)使用其他一些文件用于附加设置,帮助和日志。这个区"
+"域用æ¥å‘Šè¯‰ Privoxy 从哪里找到这些文件。"
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:32
msgid ""
@@ -336,7 +339,7 @@ msgid ""
"access, and removing ads and other obnoxious Internet junk."
msgstr ""
"Privoxy 是一个无缓存的网络代ç†ï¼Œå…·æœ‰é«˜çº§è¿‡æ»¤åŠŸèƒ½ï¼Œèƒ½å¤Ÿä¿®æ”¹ç½‘页数æ®å’Œ HTTP 请"
-"求头,控制访问,移除广告等。"
+"求头ã€æŽ§åˆ¶è®¿é—®ã€ç§»é™¤å¹¿å‘Šç­‰ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:908
msgid "Read / Reread log file"
@@ -356,11 +359,11 @@ msgstr "显示请求头 解æž"
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:76
msgid "Software package '%s' is not installed."
-msgstr "软件包 '%s' 未安装"
+msgstr "软件包“%sâ€æœªå®‰è£…。"
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:85
msgid "Software package '%s' is outdated."
-msgstr "软件包 '%s' 已过时"
+msgstr "软件包“%sâ€å·²è¿‡æ—¶ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:125
#: applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm:10
@@ -381,19 +384,19 @@ msgstr "å¯åŠ¨æ ‡è¯­å’Œè­¦å‘Šã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:455
msgid "Syntax:"
-msgstr "æ ¼å¼:"
+msgstr "æ ¼å¼ï¼š"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:786
msgid "Syntax: Client header names delimited by spaces."
-msgstr "æ ¼å¼: 由空格分隔的客户端请求头å称。"
+msgstr "æ ¼å¼ï¼šç”±ç©ºæ ¼åˆ†éš”的客户端请求头å称。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:612
msgid "Syntax: target_pattern http_parent[:port]"
-msgstr "æ ¼å¼: target_pattern http_parent[:port]"
+msgstr "æ ¼å¼ï¼štarget_pattern http_parent[:port]"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:620
msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
-msgstr "æ ¼å¼: target_pattern socks_proxy[:port] http_parent[:port]"
+msgstr "æ ¼å¼ï¼štarget_pattern socks_proxy[:port] http_parent[:port]"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:59
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:62
@@ -431,11 +434,11 @@ msgstr "其他设置文件所在的目录。"
msgid ""
"The filter files contain content modification rules that use regular "
"expressions."
-msgstr "过滤文件包å«äº†ä½¿ç”¨æ­£åˆ™è¡¨è¾¾å¼ç¼–写的内容修改规则"
+msgstr "过滤文件包å«äº†ä½¿ç”¨æ­£åˆ™è¡¨è¾¾å¼ç¼–写的内容修改规则。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:183
msgid "The hostname shown on the CGI pages."
-msgstr "CGI页é¢æ˜¾ç¤ºçš„主机å。"
+msgstr "CGI 页é¢æ˜¾ç¤ºçš„主机å。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:274
msgid "The log file to use. File name, relative to log directory."
@@ -463,7 +466,7 @@ msgstr "信任机制是一个实验性的白åå•ç‰¹æ€§ï¼Œä½¿ç”¨æ—¶åº”å°å¿ƒã€‚
msgid ""
"The value of this option only matters if the experimental trust mechanism "
"has been activated."
-msgstr "åªæœ‰å¼€å¯äº†ä¿¡ä»»æœºåˆ¶æ—¶è¿™ä¸ªé€‰é¡¹çš„值æ‰æœ‰æ•ˆ"
+msgstr "åªæœ‰å¼€å¯äº†ä¿¡ä»»æœºåˆ¶æ—¶è¿™ä¸ªé€‰é¡¹çš„值æ‰æœ‰æ•ˆã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:796
msgid ""
@@ -487,7 +490,7 @@ msgid ""
"Through which SOCKS proxy (and optionally to which parent HTTP proxy) "
"specific requests should be routed."
msgstr ""
-"指定的请求应该通过哪一个 SOCKS 代ç†ï¼ˆå¹¶ä¸”通过哪一个 HTTP 父代ç†ï¼Œå¯é€‰ï¼‰"
+"指定的请求应该通过哪一个 SOCKS 代ç†ï¼ˆå¹¶ä¸”通过哪一个 HTTP 父代ç†ï¼Œå¯é€‰ï¼‰ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:610
msgid "To which parent HTTP proxy specific requests should be routed."
@@ -509,26 +512,26 @@ msgstr "输入值ä¸æ˜¯æ•°å­—"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:168
msgid "Value not between 0 and 300"
-msgstr "输入值ä¸åœ¨0å’Œ300之间"
+msgstr "输入值ä¸åœ¨ 0 å’Œ 300 之间"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:774
msgid "Value not between 0 and 9"
-msgstr "输入值ä¸åœ¨0å’Œ9之间"
+msgstr "输入值ä¸åœ¨ 0 å’Œ 9 之间"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:545
msgid "Value not between 1 and 4096"
-msgstr "输入值ä¸åœ¨1å’Œ4096之间"
+msgstr "输入值ä¸åœ¨ 1 å’Œ 4096 之间"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:675
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:698
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:722
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:741
msgid "Value not greater 0 or empty"
-msgstr "输入值为空或者ä¸æ˜¯å¤§äºŽé›¶ã€‚"
+msgstr "输入值为空或者ä¸æ˜¯å¤§äºŽé›¶"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:537
msgid "Value range 1 to 4096, no entry defaults to 4096"
-msgstr "输入值为1到4096,默认为4096"
+msgstr "输入值为 1 到 4096,默认为 4096"
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:45
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:47
@@ -542,23 +545,23 @@ msgstr "版本信æ¯"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:646
msgid "Whether intercepted requests should be treated as valid."
-msgstr "被拦截的请求是å¦åº”被当作有效的。"
+msgstr "是å¦åº”把被拦截的请求当作是有效的。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:572
msgid ""
"Whether or not Privoxy recognizes special HTTP headers to change toggle "
"state."
-msgstr "Privoxy 是å¦è¯†åˆ«ç‰¹æ®Šçš„ HTTP 请求头以切æ¢çŠ¶æ€ã€‚"
+msgstr "是å¦è®© Privoxy 识别特殊的 HTTP 请求头以切æ¢çŠ¶æ€ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:758
msgid "Whether or not buffered content is compressed before delivery."
-msgstr "缓冲内容在传递之å‰æ˜¯å¦åŽ‹ç¼©ã€‚"
+msgstr "是å¦åœ¨ä¼ é€’之å‰åŽ‹ç¼©ç¼“冲内容。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:706
msgid ""
"Whether or not outgoing connections that have been kept alive should be "
"shared between different incoming connections."
-msgstr "æŒä¹…出站连接是å¦åº”在ä¸åŒçš„入站连接之间共享。"
+msgstr "是å¦åº”在ä¸åŒçš„入站连接之间共享æŒä¹…出站连接。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:683
msgid "Whether or not pipelined requests should be served."
@@ -578,12 +581,12 @@ msgstr "是å¦å¯ç”¨åŸºäºŽç½‘页的切æ¢åŠŸèƒ½ã€‚"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:653
msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected."
-msgstr "访问 Privoxy CGI 页é¢çš„请求是å¦å¯ä»¥è¢«æ‹¦æˆªæˆ–é‡å®šå‘。"
+msgstr "是å¦å¯ä»¥è¢«æ‹¦æˆªæˆ–é‡å®šå‘访问 Privoxy CGI 页é¢çš„请求。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:660
msgid ""
"Whether the CGI interface should stay compatible with broken HTTP clients."
-msgstr "CGI ç•Œé¢æ˜¯å¦åº”兼容过时的HTTP客户端。"
+msgstr "是å¦è®© CGI ç•Œé¢å…¼å®¹è¿‡æ—¶çš„ HTTP 客户端。"
#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:794
msgid "Whether to run only one server thread."
@@ -610,14 +613,3 @@ msgstr "或更高"
#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:89
msgid "required"
msgstr "需è¦"
-
-#~ msgid "Local Set-up"
-#~ msgstr "本地设置"
-
-#~ msgid "Software update required"
-#~ msgstr "需è¦å‡çº§è½¯ä»¶"
-
-#~ msgid ""
-#~ "The currently installed 'privoxy' package is not supported by LuCI "
-#~ "application."
-#~ msgstr "ç›®å‰å®‰è£…çš„privoxy版本ä¸è¢«luci支æŒã€‚"
diff --git a/applications/luci-app-privoxy/po/zh-tw/privoxy.po b/applications/luci-app-privoxy/po/zh-tw/privoxy.po
new file mode 100644
index 0000000000..e5ec2e4156
--- /dev/null
+++ b/applications/luci-app-privoxy/po/zh-tw/privoxy.po
@@ -0,0 +1,615 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: luci-app-privoxy\n"
+"POT-Creation-Date: 2015-06-10 20:16+0100\n"
+"PO-Revision-Date: 2019-01-03 22:42+0800\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Gtranslator 3.30.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:236
+msgid ""
+"A URL to be displayed in the error page that users will see if access to an "
+"untrusted page is denied."
+msgstr "當用戶試圖訪å•ä¸å—信任的é é¢æ™‚,錯誤é é¢æ‰€é¡¯ç¤ºçš„ URL。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:226
+msgid ""
+"A URL to documentation about the local Privoxy setup, configuration or "
+"policies."
+msgstr "æŒ‡å‘ Privoxy 安è£ã€è¨­å®šå’Œè¦å‰‡èªªæ˜Žæ–‡ä»¶çš„ URL。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:325
+msgid "A directory where Privoxy can create temporary files."
+msgstr "Privoxy 存放臨時檔案的目錄。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:84
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:87
+msgid "Access Control"
+msgstr "訪å•æŽ§åˆ¶"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:337
+msgid "Actions that are applied to all sites and maybe overruled later on."
+msgstr "作用在所有站點上的è¦å‰‡ï¼Œå¯èƒ½è¢«å¾Œé¢çš„è¦å‰‡è¦†è“‹ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:308
+msgid "An alternative directory where the templates are loaded from."
+msgstr "å¯é¸çš„目錄,放在裡é¢çš„模æ¿æœƒè¢«è¼‰å…¥ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:206
+msgid "An email address to reach the Privoxy administrator."
+msgstr "用於è¯çµ¡ Privoxy 管ç†å“¡çš„郵箱地å€ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:691
+msgid ""
+"Assumed server-side keep-alive timeout (in seconds) if not specified by the "
+"server."
+msgstr "當æœå‹™ç«¯æ²’有指定超時時間時å‡å®šçš„超時時間(單ä½ï¼šç§’)。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:151
+msgid "Boot delay"
+msgstr "啟動延時"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:869
+msgid "CGI user interface"
+msgstr "CGI 使用者介é¢"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:857
+msgid "Common Log Format"
+msgstr "通用日誌格å¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:92
+msgid ""
+"Configure here the routing of HTTP requests through a chain of multiple "
+"proxies. Note that parent proxies can severely decrease your privacy level. "
+"Also specified here are SOCKS proxies."
+msgstr ""
+"在這裡設定 HTTP 請求所經éŽçš„多é‡ä»£ç†éˆã€‚注æ„:父級代ç†å¯èƒ½åš´é‡é™ä½Žæ‚¨çš„éš±ç§å®‰"
+"全度。在這裡還å¯ä»¥è¨­å®š SOCKS 代ç†ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:851
+msgid "Debug GIF de-animation"
+msgstr "除錯 GIF 動畫"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:833
+msgid "Debug force feature"
+msgstr "除錯 Force feature"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:845
+msgid "Debug redirects"
+msgstr "除錯é‡å®šå‘"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:839
+msgid "Debug regular expression filters"
+msgstr "除錯正則表示å¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:152
+msgid "Delay (in seconds) during system boot before Privoxy start"
+msgstr "Privoxy 自啟動延é²æ™‚間(單ä½ï¼šç§’)"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:261
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:298
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:315
+msgid "Directory does not exist!"
+msgstr "目錄ä¸å­˜åœ¨ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:557
+msgid "Disabled == Transparent Proxy Mode"
+msgstr "ç¦ç”¨ == é€æ˜Žä»£ç†æ¨¡å¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:66
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:71
+msgid "Documentation"
+msgstr "記錄資訊"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:154
+msgid "During delay ifup-events are not monitored !"
+msgstr "在延é²æœŸé–“無法檢測到 ifup 事件ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:599
+msgid "Enable proxy authentication forwarding"
+msgstr "å…許轉發代ç†èªè­‰"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:135
+msgid ""
+"Enable/Disable autostart of Privoxy on system startup and interface events"
+msgstr "啟用/ç¦ç”¨ Privoxy 在系統啟動或介é¢äº‹ä»¶æ™‚自動啟動"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:555
+msgid "Enable/Disable filtering when Privoxy starts."
+msgstr "Privoxy 啟動時啟用/ç¦ç”¨éŽæ¿¾ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:134
+msgid "Enabled"
+msgstr "已啟用"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:602
+msgid ""
+"Enabling this option is NOT recommended if there is no parent proxy that "
+"requires authentication!"
+msgstr "如果沒有需è¦èªè­‰çš„父級代ç†æ™‚,ä¸æŽ¨è–¦é–‹å•Ÿé€™å€‹é¸é …ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:368
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:404
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:442
+msgid "File '%s' not found inside Configuration Directory"
+msgstr "在設定目錄中未找到檔案“%sâ€"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:915
+#: applications/luci-app-privoxy/luasrc/view/privoxy/detail_logview.htm:12
+msgid "File not found or empty"
+msgstr "檔案ä¸å­˜åœ¨æˆ–為空"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:75
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:80
+msgid "Files and Directories"
+msgstr "檔案和目錄"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:36
+msgid "For help use link at the relevant option"
+msgstr "點é¸ç›¸æ‡‰é¸é …的連線å¯ç²å–幫助"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:91
+msgid "Forwarding"
+msgstr "轉發"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:589
+msgid ""
+"If enabled, Privoxy hides the 'go there anyway' link. The user obviously "
+"should not be able to bypass any blocks."
+msgstr "如果啟用,Privoxy 會隱è—“go there anywayâ€é€£çµï¼Œä½¿ç”¨è€…å°±ä¸èƒ½ç¹žéŽé®è”½ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:67
+msgid ""
+"If you intend to operate Privoxy for more users than just yourself, it might "
+"be a good idea to let them know how to reach you, what you block and why you "
+"do that, your policies, etc."
+msgstr ""
+"如果除了您還有其他使用者使用 Privoxy 連線,最好讓他們知é“如何è¯çµ¡æ‚¨ï¼Œæ‚¨é®è”½ä»€"
+"麼,您為什麼這樣åšï¼Œæ‚¨çš„政策等等。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:215
+msgid "Invalid email address"
+msgstr "郵箱地å€ç„¡æ•ˆ"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:416
+msgid "It is NOT recommended for the casual user."
+msgstr "ä¸æŽ¨è–¦æ–°æ‰‹ä½¿ç”¨ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:194
+msgid "Location of the Privoxy User Manual."
+msgstr "Privoxy 使用者手冊ä½ç½®ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:108
+msgid "Log File Viewer"
+msgstr "日誌檢視器"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:895
+msgid "Log all data read from the network"
+msgstr "記錄所有接收的網路資料"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:827
+msgid "Log all data written to the network"
+msgstr "記錄所有傳é€çš„網路資料"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:901
+msgid "Log the applying actions"
+msgstr "記錄é…置儲存動作"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:803
+msgid ""
+"Log the destination for each request Privoxy let through. See also 'Debug "
+"1024'."
+msgstr "記錄 Privoxy å…許的所有請求。å¦è«‹åƒè€ƒâ€œDebug 1024â€ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:863
+msgid ""
+"Log the destination for requests Privoxy didn't let through, and the reason "
+"why."
+msgstr "記錄 Privoxy 拒絕的請求目標以åŠæ‹’絕原因。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:104
+msgid "Logging"
+msgstr "日誌"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:339
+msgid "Main actions file"
+msgstr "主è¦è¦å‰‡æª”案"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:461
+msgid "Mandatory Input: No Data given!"
+msgstr "必需é¸é …:沒有設定資料ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:259
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:296
+msgid "Mandatory Input: No Directory given!"
+msgstr "必需é¸é …:沒有設定目錄ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:279
+msgid "Mandatory Input: No File given!"
+msgstr "必需é¸é …:沒有設定檔案ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:479
+msgid "Mandatory Input: No Port given!"
+msgstr "必需é¸é …:沒有設定埠ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:345
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:381
+msgid "Mandatory Input: No files given!"
+msgstr "必需é¸é …:沒有設定檔案ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:482
+msgid "Mandatory Input: No valid IPv4 address or host given!"
+msgstr "必需é¸é …:沒有設定有效的 IPv4 地å€æˆ–者主機ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:470
+msgid "Mandatory Input: No valid IPv6 address given!"
+msgstr "必需é¸é …:沒有設定有效的 IPv6 地å€ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:472
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:484
+msgid "Mandatory Input: No valid Port given!"
+msgstr "必需é¸é …:沒有設定有效的埠ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:733
+msgid "Maximum number of client connections that will be served."
+msgstr "客戶端數é‡ä¸Šé™ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:535
+msgid "Maximum size (in KB) of the buffer for content filtering."
+msgstr "內容éŽæ¿¾çš„最大緩è¡ï¼ˆå–®ä½ï¼šKB)。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:97
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:100
+msgid "Miscellaneous"
+msgstr "雜項"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:51
+msgid "NOT installed"
+msgstr "未安è£"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:254
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:291
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:310
+msgid "No trailing '/', please."
+msgstr "路徑çµå°¾ä¸è¦åŠ â€œ/â€ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:881
+msgid "Non-fatal errors - *we highly recommended enabling this*"
+msgstr "éžè‡´å‘½æ€§éŒ¯èª¤ - *強烈建議啟用*"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:714
+msgid ""
+"Number of seconds after which a socket times out if no data is received."
+msgstr "Socket 連線未收到資料的超時時間。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:668
+msgid ""
+"Number of seconds after which an open connection will no longer be reused."
+msgstr "開放的連線ä¸å†é‡è¤‡ä½¿ç”¨çš„超時時間。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:327
+msgid ""
+"Only when using 'external filters', Privoxy has to create temporary files."
+msgstr "åªæœ‰ä½¿ç”¨å¤–接è¦å‰‡æ™‚,Privoxy æ‰éœ€è¦å»ºç«‹è‡¨æ™‚檔案。"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:81
+msgid "Please install current version !"
+msgstr "請安è£ç•¶å‰ç‰ˆæœ¬ï¼"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:913
+msgid "Please press [Read] button"
+msgstr "è«‹é»žé¸ [讀å–] 按鈕"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:518
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:527
+msgid "Please read Privoxy manual for details!"
+msgstr "請閱讀 Privoxy 手冊以瞭解詳情ï¼"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:92
+msgid "Please update to the current version!"
+msgstr "è«‹å‡ç´šåˆ°ç•¶å‰ç‰ˆæœ¬ï¼"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:24
+msgid "Privoxy WEB proxy"
+msgstr "Privoxy 網路代ç†"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:76
+msgid ""
+"Privoxy can (and normally does) use a number of other files for additional "
+"configuration, help and logging. This section of the configuration file "
+"tells Privoxy where to find those other files."
+msgstr ""
+"Privoxy å¯ä»¥ï¼ˆè€Œä¸”一般都會)使用其他一些檔案用於附加設定,幫助和日誌。這個å€"
+"域用來告訴 Privoxy 從哪裡找到這些檔案。"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:32
+msgid ""
+"Privoxy is a non-caching web proxy with advanced filtering capabilities for "
+"enhancing privacy, modifying web page data and HTTP headers, controlling "
+"access, and removing ads and other obnoxious Internet junk."
+msgstr ""
+"Privoxy 是一個無快å–的網路代ç†ï¼Œå…·æœ‰é«˜éšŽéŽæ¿¾åŠŸèƒ½ï¼Œèƒ½å¤ ä¿®æ”¹ç¶²é è³‡æ–™å’Œ HTTP è«‹"
+"求頭ã€æŽ§åˆ¶è¨ªå•ã€ç§»é™¤å»£å‘Šç­‰ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:908
+msgid "Read / Reread log file"
+msgstr "讀å–/é‡æ–°æ•´ç†æ—¥èªŒæª”案"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:815
+msgid "Show I/O status"
+msgstr "顯示 I/O 狀態"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:809
+msgid "Show each connection status"
+msgstr "顯示æ¯å€‹é€£ç·šçš„狀態"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:821
+msgid "Show header parsing"
+msgstr "顯示請求頭 解æž"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:76
+msgid "Software package '%s' is not installed."
+msgstr "軟體包“%sâ€æœªå®‰è£ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:85
+msgid "Software package '%s' is outdated."
+msgstr "軟體包“%sâ€å·²éŽæ™‚。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:125
+#: applications/luci-app-privoxy/luasrc/view/privoxy/detail_startstop.htm:10
+msgid "Start"
+msgstr "å•Ÿå‹•"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:115
+msgid "Start / Stop"
+msgstr "å•Ÿå‹• / åœæ­¢"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:116
+msgid "Start/Stop Privoxy WEB Proxy"
+msgstr "å•Ÿå‹•/åœæ­¢ Privoxy 網路代ç†"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:875
+msgid "Startup banner and warnings."
+msgstr "啟動標語和警告。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:455
+msgid "Syntax:"
+msgstr "æ ¼å¼ï¼š"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:786
+msgid "Syntax: Client header names delimited by spaces."
+msgstr "æ ¼å¼ï¼šç”±ç©ºæ ¼åˆ†éš”的客戶端請求頭å稱。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:612
+msgid "Syntax: target_pattern http_parent[:port]"
+msgstr "æ ¼å¼ï¼štarget_pattern http_parent[:port]"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:620
+msgid "Syntax: target_pattern socks_proxy[:port] http_parent[:port]"
+msgstr "æ ¼å¼ï¼štarget_pattern socks_proxy[:port] http_parent[:port]"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:59
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:62
+msgid "System"
+msgstr "系統"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:335
+msgid ""
+"The actions file(s) to use. Multiple actionsfile lines are permitted, and "
+"are in fact recommended!"
+msgstr "所使用的è¦å‰‡æª”案。å…許並且推薦使用多個è¦å‰‡æª”案。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:453
+msgid ""
+"The address and TCP port on which Privoxy will listen for client requests."
+msgstr "Privoxy 接收客戶端請求時監è½çš„地å€å’Œ TCP 埠。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:766
+msgid ""
+"The compression level that is passed to the zlib library when compressing "
+"buffered content."
+msgstr "使用 zlib 壓縮緩è¡å…§å®¹æ™‚的壓縮級別。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:252
+msgid ""
+"The directory where all logging takes place (i.e. where the logfile is "
+"located)."
+msgstr "所有日誌所在的目錄。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:289
+msgid "The directory where the other configuration files are located."
+msgstr "其他設定檔案所在的目錄。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:377
+msgid ""
+"The filter files contain content modification rules that use regular "
+"expressions."
+msgstr "éŽæ¿¾æª”案包å«äº†ä½¿ç”¨æ­£å‰‡è¡¨ç¤ºå¼ç·¨å¯«çš„內容修改è¦å‰‡ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:183
+msgid "The hostname shown on the CGI pages."
+msgstr "CGI é é¢é¡¯ç¤ºçš„主機å。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:274
+msgid "The log file to use. File name, relative to log directory."
+msgstr "日誌檔å稱,與日誌路徑相å°ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:784
+msgid "The order in which client headers are sorted before forwarding them."
+msgstr "轉發資料å‰ï¼Œå®¢æˆ¶ç«¯è«‹æ±‚頭的排åºã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:751
+msgid ""
+"The status code Privoxy returns for pages blocked with +handle-as-empty-"
+"document."
+msgstr ""
+"當é é¢å› ç‚º handle-as-empty-document è¦å‰‡è¢«é˜»æ­¢æ™‚返回的狀態碼(é¸ä¸Šç‚º 200 OK,"
+"ä¸é¸ä¸Šç‚º 403 Forbidden)"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:413
+msgid ""
+"The trust mechanism is an experimental feature for building white-lists and "
+"should be used with care."
+msgstr "信任機制是一個實驗性的白å單特性,使用時應å°å¿ƒã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:238
+msgid ""
+"The value of this option only matters if the experimental trust mechanism "
+"has been activated."
+msgstr "åªæœ‰é–‹å•Ÿäº†ä¿¡ä»»æ©Ÿåˆ¶æ™‚這個é¸é …的值æ‰æœ‰æ•ˆã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:796
+msgid ""
+"This option is only there for debugging purposes. It will drastically reduce "
+"performance."
+msgstr "這個é¸é …僅用於除錯,開啟後會極大地é™ä½Žæ•ˆèƒ½ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:574
+msgid ""
+"This option will be removed in future releases as it has been obsoleted by "
+"the more general header taggers."
+msgstr "這個é¸é …在以後的版本中將被移除,因為它被 header taggers 所å–代了。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:85
+msgid ""
+"This tab controls the security-relevant aspects of Privoxy's configuration."
+msgstr "這個標籤用於設定與安全相關的 Privoxy é¸é …。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:618
+msgid ""
+"Through which SOCKS proxy (and optionally to which parent HTTP proxy) "
+"specific requests should be routed."
+msgstr ""
+"指定的請求應該通éŽå“ªä¸€å€‹ SOCKS 代ç†ï¼ˆä¸¦ä¸”通éŽå“ªä¸€å€‹ HTTP 父代ç†ï¼Œå¯é¸ï¼‰ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:610
+msgid "To which parent HTTP proxy specific requests should be routed."
+msgstr "請求應轉發至哪一個父級 HTTP 代ç†ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:341
+msgid "User customizations"
+msgstr "使用者自定義"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:166
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:543
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:673
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:696
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:720
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:739
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:772
+msgid "Value is not a number"
+msgstr "輸入值ä¸æ˜¯æ•¸å­—"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:168
+msgid "Value not between 0 and 300"
+msgstr "輸入值ä¸åœ¨ 0 å’Œ 300 之間"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:774
+msgid "Value not between 0 and 9"
+msgstr "輸入值ä¸åœ¨ 0 å’Œ 9 之間"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:545
+msgid "Value not between 1 and 4096"
+msgstr "輸入值ä¸åœ¨ 1 å’Œ 4096 之間"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:675
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:698
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:722
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:741
+msgid "Value not greater 0 or empty"
+msgstr "輸入值為空或者ä¸æ˜¯å¤§æ–¼é›¶"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:537
+msgid "Value range 1 to 4096, no entry defaults to 4096"
+msgstr "輸入值為 1 到 4096,é è¨­ç‚º 4096"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:45
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:47
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:50
+msgid "Version"
+msgstr "版本"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:43
+msgid "Version Information"
+msgstr "版本資訊"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:646
+msgid "Whether intercepted requests should be treated as valid."
+msgstr "是å¦æ‡‰æŠŠè¢«æ””截的請求當作是有效的。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:572
+msgid ""
+"Whether or not Privoxy recognizes special HTTP headers to change toggle "
+"state."
+msgstr "是å¦è®“ Privoxy 識別特殊的 HTTP 請求頭以切æ›ç‹€æ…‹ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:758
+msgid "Whether or not buffered content is compressed before delivery."
+msgstr "是å¦åœ¨å‚³éžä¹‹å‰å£“縮緩è¡å…§å®¹ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:706
+msgid ""
+"Whether or not outgoing connections that have been kept alive should be "
+"shared between different incoming connections."
+msgstr "是å¦æ‡‰åœ¨ä¸åŒçš„入站連線之間共享æŒä¹…出站連線。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:683
+msgid "Whether or not pipelined requests should be served."
+msgstr "是å¦è™•ç†ç®¡é“化的請求。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:600
+msgid "Whether or not proxy authentication through Privoxy should work."
+msgstr "是å¦å¯ä»¥é€šéŽ Privoxy 進行代ç†é©—證。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:582
+msgid "Whether or not the web-based actions file editor may be used."
+msgstr "是å¦ä½¿ç”¨åŸºæ–¼ç¶²é çš„è¦å‰‡ç·¨è¼¯å™¨ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:565
+msgid "Whether or not the web-based toggle feature may be used."
+msgstr "是å¦å•Ÿç”¨åŸºæ–¼ç¶²é çš„切æ›åŠŸèƒ½ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:653
+msgid "Whether requests to Privoxy's CGI pages can be blocked or redirected."
+msgstr "是å¦å¯ä»¥è¢«æ””截或é‡å®šå‘è¨ªå• Privoxy CGI é é¢çš„請求。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:660
+msgid ""
+"Whether the CGI interface should stay compatible with broken HTTP clients."
+msgstr "是å¦è®“ CGI 介é¢ç›¸å®¹éŽæ™‚çš„ HTTP 客戶端。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:794
+msgid "Whether to run only one server thread."
+msgstr "是å¦åªåŸ·è¡Œä¸€å€‹æœå‹™åŸ·è¡Œç·’。"
+
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:516
+#: applications/luci-app-privoxy/luasrc/model/cbi/privoxy.lua:525
+msgid "Who can access what."
+msgstr "誰å¯ä»¥è¨ªå•ä»€éº¼ã€‚"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:49
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:87
+msgid "installed"
+msgstr "已安è£"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:48
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:78
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:89
+msgid "or higher"
+msgstr "或更高"
+
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:46
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:78
+#: applications/luci-app-privoxy/luasrc/controller/privoxy.lua:89
+msgid "required"
+msgstr "需è¦"
diff --git a/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua b/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
index ef15ed6127..e967ce6283 100644
--- a/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
+++ b/applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua
@@ -9,7 +9,7 @@ m = Map("pppoe", translate("Roaring Penguin PPPoE Server"),
translate("PPPoE Server Configuration"))
s = m:section(TypedSection, "pppoe_server", translate("Server Configuration"))
-s.addremove = false
+s.addremove = true
s.anonymous = true
o = s:option(Value, "interface", translate("Interface"), translate("Interface on which to listen."))
diff --git a/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po b/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po
new file mode 100644
index 0000000000..451e44de1e
--- /dev/null
+++ b/applications/luci-app-rp-pppoe-server/po/en/rp-pppoe-server.po
@@ -0,0 +1,101 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2019-01-09 07:01-0500\n"
+"Last-Translator: Daniel F. Dickinson <cshored@thecshore.com>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+msgid "Access Concentrator Name"
+msgstr "Access Concentrator Name"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+msgid "First remote IP"
+msgstr "First remote IP"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+msgid "IP of listening side"
+msgstr "IP of listening side"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+msgid ""
+"Instead of starting at beginning and going to end, randomize session number"
+msgstr ""
+"Instead of starting at beginning and going to end, randomize session number"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+msgid "Interface"
+msgstr "Interface"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+msgid "Interface on which to listen."
+msgstr "Interface on which to listen."
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+msgid "MSS"
+msgstr "MSS"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
+msgid "Maximum sessions"
+msgstr "Maximum sessions"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+msgid "Maximum sessions per peer"
+msgstr "Maximum sessions per peer"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+msgid "Offset"
+msgstr "Offset"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+msgid "Options file"
+msgstr "Options file"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+msgid "PPP offset"
+msgstr "PPP offset"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+msgid "PPP unit number"
+msgstr "PPP unit number"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+msgid "PPPoE Server Configuration"
+msgstr "PPPoE Server Configuration"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/controller/rp-pppoe-server.lua:11
+msgid "RP PPPoE Server"
+msgstr "RP PPPoE Server"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+msgid "Random session selection"
+msgstr "Random session selection"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+msgid "Roaring Penguin PPPoE Server"
+msgstr "Roaring Penguin PPPoE Server"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+msgid "Server Configuration"
+msgstr "Server Configuration"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+msgid "Service Name"
+msgstr "Service Name"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
+msgid "Sync"
+msgstr "Sync"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+msgid "Timeout"
+msgstr "Timeout"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+msgid "Unit"
+msgstr "Unit"
diff --git a/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot b/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot
new file mode 100644
index 0000000000..8aff2f55ff
--- /dev/null
+++ b/applications/luci-app-rp-pppoe-server/po/templates/rp-pppoe-server.pot
@@ -0,0 +1,91 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:19
+msgid "Access Concentrator Name"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:32
+msgid "First remote IP"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:29
+msgid "IP of listening side"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+msgid ""
+"Instead of starting at beginning and going to end, randomize session number"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+msgid "Interface"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:15
+msgid "Interface on which to listen."
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:62
+msgid "MSS"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:35
+msgid "Maximum sessions"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:25
+msgid "Maximum sessions per peer"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+msgid "Offset"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:40
+msgid "Options file"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:52
+msgid "PPP offset"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+msgid "PPP unit number"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:9
+msgid "PPPoE Server Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/controller/rp-pppoe-server.lua:11
+msgid "RP PPPoE Server"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:44
+msgid "Random session selection"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:8
+msgid "Roaring Penguin PPPoE Server"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:11
+msgid "Server Configuration"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:22
+msgid "Service Name"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:68
+msgid "Sync"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:57
+msgid "Timeout"
+msgstr ""
+
+#: applications/luci-app-rp-pppoe-server/luasrc/model/cbi/rp-pppoe-server.lua:47
+msgid "Unit"
+msgstr ""
diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
index 4a01bed247..553b297ac0 100644
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/rules.lua
@@ -98,8 +98,8 @@ else
o.inputstyle = "apply"
o.write = function()
return luci.http.redirect(
- luci.dispatcher.build_url("admin/system/packages") ..
- "?submit=1&install=iptables-mod-conntrack-extra"
+ luci.dispatcher.build_url("admin/system/opkg") ..
+ "?query=iptables-mod-conntrack-extra"
)
end
end
diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
index 5fc20c52bc..cbe32afde6 100644
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
@@ -199,8 +199,8 @@ function option_install_package(s, tab)
function p_install.write()
return luci.http.redirect(
- luci.dispatcher.build_url("admin/system/packages") ..
- "?submit=1&install=%s" % opkg_package
+ luci.dispatcher.build_url("admin/system/opkg") ..
+ "?query=%s" % opkg_package
)
end
end
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 612de689f5..6834768954 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
@@ -156,7 +156,7 @@ msgstr "一些输出"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
msgid "Start Simple Adblock service"
-msgstr ""
+msgstr "å¯åŠ¨ç®€å• Adblock æœåŠ¡"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Stop the download if it is stalled for set number of seconds"
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 4543b2fe87..e64b971936 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
@@ -156,7 +156,7 @@ msgstr "一些輸出"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simpleadblock.lua:5
msgid "Start Simple Adblock service"
-msgstr ""
+msgstr "å•Ÿå‹•ç°¡å–® Adblock æœå‹™"
#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:106
msgid "Stop the download if it is stalled for set number of seconds"
diff --git a/applications/luci-app-statistics/po/zh-cn/statistics.po b/applications/luci-app-statistics/po/zh-cn/statistics.po
index 7bbd2d8b00..f7891e548a 100644
--- a/applications/luci-app-statistics/po/zh-cn/statistics.po
+++ b/applications/luci-app-statistics/po/zh-cn/statistics.po
@@ -1,19 +1,19 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2017-10-29 15:50+0800\n"
+"PO-Revision-Date: 2019-01-03 21:39+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:26
@@ -196,7 +196,7 @@ msgstr "留空 = 监控所有"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:17
msgid "Enable"
-msgstr ""
+msgstr "å¯ç”¨"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
@@ -467,7 +467,7 @@ msgstr "监测远程端å£"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
-msgstr ""
+msgstr "å称"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:46
msgid "Name of the rule"
@@ -976,7 +976,7 @@ msgstr "UPS å使用 NUT(Network UPS Tools)格å¼ï¼šups@host"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:22
msgid "URL"
-msgstr ""
+msgstr "URL"
#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:57
msgid "UnixSock"
@@ -1026,11 +1026,11 @@ msgstr "您å¯ä»¥å®‰è£…更多的 collectd-mod-* æ’件以获得更多的统计æ•
#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:32
msgid "cUrl"
-msgstr ""
+msgstr "cUrl"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:5
msgid "cUrl Plugin Configuration"
-msgstr ""
+msgstr "cUrl æ’件é…ç½®"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:110
msgid "e.g. br-ff"
diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po
index 634de0118c..0f70d8b5a8 100644
--- a/applications/luci-app-statistics/po/zh-tw/statistics.po
+++ b/applications/luci-app-statistics/po/zh-tw/statistics.po
@@ -1,19 +1,19 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017-2019.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2017-10-29 15:50+0800\n"
+"PO-Revision-Date: 2019-01-03 21:39+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:26
@@ -196,7 +196,7 @@ msgstr "留空 = 監控所有"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:17
msgid "Enable"
-msgstr ""
+msgstr "啟用"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/apcups.lua:14
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/conntrack.lua:18
@@ -467,7 +467,7 @@ msgstr "監測é ç«¯åŸ "
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:20
msgid "Name"
-msgstr ""
+msgstr "å稱"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:46
msgid "Name of the rule"
@@ -976,7 +976,7 @@ msgstr "UPS å使用 NUT(Network UPS Tools)格å¼ï¼šups@host"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:22
msgid "URL"
-msgstr ""
+msgstr "URL"
#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:57
msgid "UnixSock"
@@ -1026,11 +1026,11 @@ msgstr "您å¯ä»¥å®‰è£æ›´å¤šçš„ collectd-mod-* 外掛以ç²å¾—更多的統計è³
#: applications/luci-app-statistics/luasrc/controller/luci_statistics/luci_statistics.lua:32
msgid "cUrl"
-msgstr ""
+msgstr "cUrl"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/curl.lua:5
msgid "cUrl Plugin Configuration"
-msgstr ""
+msgstr "cUrl 外掛é…ç½®"
#: applications/luci-app-statistics/luasrc/model/cbi/luci_statistics/iptables.lua:110
msgid "e.g. br-ff"
diff --git a/applications/luci-app-travelmate/po/zh-cn/travelmate.po b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
index 2cb7370818..0dbba9cb81 100644
--- a/applications/luci-app-travelmate/po/zh-cn/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-cn/travelmate.po
@@ -1,24 +1,28 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2018-2019.
#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-03 21:37+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2018-08-17 17:06+0800\n"
-"X-Generator: Gtranslator 2.91.7\n"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:197
msgid "AP on"
-msgstr ""
+msgstr "AP å¼€å¯"
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:113
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:51
msgid "Action"
-msgstr ""
+msgstr "动作"
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
@@ -171,7 +175,7 @@ msgstr "é¢å¤–选项"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:125
msgid "Faulty Stations"
-msgstr ""
+msgstr "ä¸è‰¯ç«™ç‚¹"
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:148
msgid "Find and join network on"
@@ -179,7 +183,7 @@ msgstr "查找并加入网络"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:208
msgid "For QR-Code support please install package 'qrencode'!"
-msgstr ""
+msgstr "如需 QR ç æ”¯æŒï¼Œè¯·å®‰è£…“qrencodeâ€è½¯ä»¶åŒ…ï¼"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:15
msgid ""
@@ -239,11 +243,11 @@ msgstr "接å£å‘导"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:131
msgid "Last Run"
-msgstr ""
+msgstr "上次è¿è¡Œ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:59
msgid "Loading"
-msgstr ""
+msgstr "载入中"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid ""
@@ -316,13 +320,13 @@ msgstr "ç§é’¥è·¯å¾„"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:68
msgid "ProActive Uplink Switch"
-msgstr ""
+msgstr "ProActive 上行链路切æ¢å™¨"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:69
msgid ""
"Proactively scan and switch to a higher prioritized uplink, despite of an "
"already existing connection."
-msgstr ""
+msgstr "ä¸ç®¡å·²ç»å­˜åœ¨çš„连接,主动扫æ并切æ¢åˆ°æ›´é«˜ä¼˜å…ˆçº§çš„上行链路。"
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:103
msgid ""
@@ -335,7 +339,7 @@ msgstr ""
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Radio Selection / Order"
-msgstr ""
+msgstr "无线电选择/顺åº"
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:94
msgid "Repeat scan"
@@ -344,17 +348,19 @@ msgstr "é‡æ–°æ‰«æ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:15
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:140
msgid "Restart"
-msgstr ""
+msgstr "é‡å¯"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:138
msgid "Restart Travelmate"
-msgstr ""
+msgstr "é‡å¯ Travelmate"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
msgstr ""
+"å°† travelmate é™åˆ¶åœ¨å•ä¸ªæ— çº¿ç”µä¸Šï¼ˆä¾‹å¦‚“radio1â€ï¼‰ï¼Œæˆ–改å˜æ•´ä¸ªæ‰«æ顺åºï¼ˆä¾‹"
+"如“radio1 radio2 radio0â€ï¼‰ã€‚"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "Retry limit to connect to an uplink."
@@ -389,7 +395,7 @@ msgstr "扫æ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:147
msgid "Show/Hide QR-Codes"
-msgstr ""
+msgstr "显示/éšè— QR ç "
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:116
msgid "Signal Quality Threshold"
@@ -524,7 +530,7 @@ msgstr "无线站点"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:32
msgid "add it to the wan zone of the firewall."
-msgstr ""
+msgstr "将其添加到防ç«å¢™çš„ wan 区域。"
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:56
msgid "hidden"
@@ -532,57 +538,4 @@ msgstr "éšè—"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:197
msgid "with SSID"
-msgstr ""
-
-#~ msgid ""
-#~ "Connect your Android or iOS devices to your router's WiFi using the shown "
-#~ "QR code."
-#~ msgstr "使用显示的 QR ç ï¼Œå°†æ‚¨çš„ Android 或 iOS 设备连接到路由器 WiFi。"
-
-#~ msgid ""
-#~ "Here you'll find the QR codes from all of your configured Access Points. "
-#~ "It allows you to connect your Android or iOS devices to your router's "
-#~ "WiFi using the QR code shown below."
-#~ msgstr ""
-#~ "在这里,您å¯ä»¥æ‰¾åˆ°æ‰€æœ‰å·²é…置的接入点的 QR ç ã€‚您å¯ä»¥ä½¿ç”¨ä¸‹é¢æ˜¾ç¤ºçš„ QR ç ï¼Œ"
-#~ "使 Android 或 iOS 设备连接到路由器 WiFi。"
-
-#~ msgid "Last rundate"
-#~ msgstr "最åŽè¿è¡Œæ—¶é—´"
-
-#~ msgid ""
-#~ "Provides an overview of all configured uplinks for the travelmate "
-#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan "
-#~ "for a new one. The currently used uplink is emphasized in blue."
-#~ msgstr ""
-#~ "此处显示 travelmate 接å£ï¼ˆ%s)所有已é…置上行连接的概述。您å¯ä»¥ç¼–辑ã€åˆ é™¤æˆ–"
-#~ "é‡æ–°æŽ’åºçŽ°æœ‰è¿žæŽ¥ï¼Œæˆ–扫æ新上行连接。当å‰ä½¿ç”¨çš„上行连接以è“色çªå‡ºæ˜¾ç¤ºã€‚"
-
-#~ msgid "QR-Codes"
-#~ msgstr "QR ç "
-
-#~ msgid "Radio selection"
-#~ msgstr "无线选择"
-
-#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
-#~ msgstr "å°† travelmate é™åˆ¶åœ¨ä¸“用无线电中,如“radio0â€ã€‚"
-
-#~ msgid "Station ID (SSID/BSSID)"
-#~ msgstr "站点 ID(SSID/BSSID)"
-
-#~ msgid "Station Radio"
-#~ msgstr "站点无线"
-
-#~ msgid ""
-#~ "This form shows the syslog output, pre-filtered for travelmate related "
-#~ "messages only."
-#~ msgstr "此表å•æ˜¾ç¤º syslog 输出,仅针对 travelmate 相关消æ¯è¿›è¡Œé¢„过滤。"
-
-#~ msgid "Travelmate Logfile"
-#~ msgstr "Travelmate 日志文件"
-
-#~ msgid "add it to the wan zone of the firewall.<br />"
-#~ msgstr "将其添加到防ç«å¢™çš„ wan 区域。<br />"
-
-#~ msgid "n/a"
-#~ msgstr "n/a"
+msgstr "带 SSID"
diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
index cd51fc48ab..eaa2dd4c71 100644
--- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
@@ -1,24 +1,28 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2018-2019.
#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2019-01-03 21:37+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2018-08-17 17:06+0800\n"
-"X-Generator: Gtranslator 2.91.7\n"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:197
msgid "AP on"
-msgstr ""
+msgstr "AP é–‹å•Ÿ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:113
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:51
msgid "Action"
-msgstr ""
+msgstr "動作"
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:80
msgid "Add Uplink"
@@ -69,8 +73,7 @@ msgstr "強制門戶檢測"
msgid ""
"Check the internet availability, log captive portal redirections and keep "
"the uplink connection 'alive'."
-msgstr ""
-"檢查網際網路å¯ç”¨æ€§ï¼Œè¨˜éŒ„強制網路門戶é‡å®šå‘,並ä¿æŒä¸Šè¡Œé€£ç·šç‚ºâ€œæ´»å‹•â€ç‹€æ…‹ã€‚"
+msgstr "檢查網際網路å¯ç”¨æ€§ï¼Œè¨˜éŒ„強制網路門戶é‡å®šå‘,並ä¿æŒä¸Šè¡Œé€£ç·šç‚ºâ€œæ´»å‹•â€ç‹€æ…‹ã€‚"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:69
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:86
@@ -172,7 +175,7 @@ msgstr "é¡å¤–é¸é …"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:125
msgid "Faulty Stations"
-msgstr ""
+msgstr "ä¸è‰¯ç«™é»ž"
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:148
msgid "Find and join network on"
@@ -180,7 +183,7 @@ msgstr "查詢並加入網路"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:208
msgid "For QR-Code support please install package 'qrencode'!"
-msgstr ""
+msgstr "如需 QR 碼支æ´ï¼Œè«‹å®‰è£â€œqrencodeâ€è»Ÿé«”包ï¼"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:15
msgid ""
@@ -240,11 +243,11 @@ msgstr "介é¢åš®å°Ž"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:131
msgid "Last Run"
-msgstr "最後執行時間"
+msgstr "上次執行"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:59
msgid "Loading"
-msgstr ""
+msgstr "載入中"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
msgid ""
@@ -317,13 +320,13 @@ msgstr "ç§é‘°è·¯å¾‘"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:68
msgid "ProActive Uplink Switch"
-msgstr ""
+msgstr "ProActive 上行éˆè·¯åˆ‡æ›å™¨"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:69
msgid ""
"Proactively scan and switch to a higher prioritized uplink, despite of an "
"already existing connection."
-msgstr ""
+msgstr "ä¸ç®¡å·²ç¶“存在的連線,主動掃æ並切æ›åˆ°æ›´é«˜å„ªå…ˆé †åºçš„上行éˆè·¯ã€‚"
#: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:103
msgid ""
@@ -336,7 +339,7 @@ msgstr ""
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
msgid "Radio Selection / Order"
-msgstr ""
+msgstr "ç„¡ç·šé›»é¸æ“‡/é †åº"
#: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:94
msgid "Repeat scan"
@@ -345,17 +348,19 @@ msgstr "é‡æ–°æŽƒæ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:15
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:140
msgid "Restart"
-msgstr ""
+msgstr "é‡å•Ÿ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:138
msgid "Restart Travelmate"
-msgstr ""
+msgstr "é‡å•Ÿ Travelmate"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:101
msgid ""
"Restrict travelmate to a single radio (e.g. 'radio1') or change the overall "
"scanning order (e.g. 'radio1 radio2 radio0')."
msgstr ""
+"å°‡ travelmate é™åˆ¶åœ¨å–®å€‹ç„¡ç·šé›»ä¸Šï¼ˆä¾‹å¦‚“radio1â€ï¼‰ï¼Œæˆ–改變整個掃æé †åºï¼ˆä¾‹"
+"如“radio1 radio2 radio0â€ï¼‰ã€‚"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
msgid "Retry limit to connect to an uplink."
@@ -390,7 +395,7 @@ msgstr "掃æ"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:147
msgid "Show/Hide QR-Codes"
-msgstr ""
+msgstr "顯示/éš±è— QR 碼"
#: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:116
msgid "Signal Quality Threshold"
@@ -402,7 +407,7 @@ msgstr "訊號強度"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:113
msgid "Station ID (RADIO/SSID/BSSID)"
-msgstr ""
+msgstr "站點 ID(RADIO/SSID/BSSID)"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:119
msgid "Station Interface"
@@ -533,57 +538,4 @@ msgstr "éš±è—"
#: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:197
msgid "with SSID"
-msgstr ""
-
-#~ msgid ""
-#~ "Connect your Android or iOS devices to your router's WiFi using the shown "
-#~ "QR code."
-#~ msgstr "使用顯示的 QR 碼,將您的 Android 或 iOS è£ç½®é€£ç·šåˆ°è·¯ç”±å™¨ WiFi。"
-
-#~ msgid ""
-#~ "Here you'll find the QR codes from all of your configured Access Points. "
-#~ "It allows you to connect your Android or iOS devices to your router's "
-#~ "WiFi using the QR code shown below."
-#~ msgstr ""
-#~ "在這裡,您å¯ä»¥æ‰¾åˆ°æ‰€æœ‰å·²é…置的接入點的 QR 碼。您å¯ä»¥ä½¿ç”¨ä¸‹é¢é¡¯ç¤ºçš„ QR 碼,"
-#~ "使 Android 或 iOS è£ç½®é€£ç·šåˆ°è·¯ç”±å™¨ WiFi。"
-
-#~ msgid "Last rundate"
-#~ msgstr "最後執行時間"
-
-#~ msgid ""
-#~ "Provides an overview of all configured uplinks for the travelmate "
-#~ "interface (%s). You can edit, delete or re-order existing uplinks or scan "
-#~ "for a new one. The currently used uplink is emphasized in blue."
-#~ msgstr ""
-#~ "此處顯示 travelmate 介é¢ï¼ˆ%s)所有已é…置上行連線的概述。您å¯ä»¥ç·¨è¼¯ã€åˆªé™¤æˆ–"
-#~ "é‡æ–°æŽ’åºç¾æœ‰é€£ç·šï¼Œæˆ–掃æ新上行連線。當å‰ä½¿ç”¨çš„上行連線以è—色çªå‡ºé¡¯ç¤ºã€‚"
-
-#~ msgid "QR-Codes"
-#~ msgstr "QR 碼"
-
-#~ msgid "Radio selection"
-#~ msgstr "ç„¡ç·šé¸æ“‡"
-
-#~ msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
-#~ msgstr "å°‡ travelmate é™åˆ¶åœ¨å°ˆç”¨ç„¡ç·šé›»ä¸­ï¼Œå¦‚“radio0â€ã€‚"
-
-#~ msgid "Station ID (SSID/BSSID)"
-#~ msgstr "站點 ID(SSID/BSSID)"
-
-#~ msgid "Station Radio"
-#~ msgstr "站點無線"
-
-#~ msgid ""
-#~ "This form shows the syslog output, pre-filtered for travelmate related "
-#~ "messages only."
-#~ msgstr "此表單顯示 syslog 輸出,僅é‡å° travelmate 相關訊æ¯é€²è¡Œé éŽæ¿¾ã€‚"
-
-#~ msgid "Travelmate Logfile"
-#~ msgstr "Travelmate 日誌檔案"
-
-#~ msgid "add it to the wan zone of the firewall.<br />"
-#~ msgstr "將其新增到防ç«ç‰†çš„ wan å€åŸŸã€‚<br />"
-
-#~ msgid "n/a"
-#~ msgstr "n/a"
+msgstr "帶 SSID"
diff --git a/applications/luci-app-uhttpd/po/en/uhttpd.po b/applications/luci-app-uhttpd/po/en/uhttpd.po
new file mode 100644
index 0000000000..67c06d8547
--- /dev/null
+++ b/applications/luci-app-uhttpd/po/en/uhttpd.po
@@ -0,0 +1,265 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2019-01-09 07:00-0500\n"
+"Last-Translator: Daniel F. Dickinson <cshored@theshore.com>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:135
+msgid ""
+"(/old/path=/new/path) or (just /old/path which becomes /cgi-prefix/old/path)"
+msgstr ""
+"(/old/path=/new/path) or (just /old/path which becomes /cgi-prefix/old/path)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:145
+msgid "404 Error"
+msgstr "404 Error"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:7
+msgid "A lightweight single-threaded HTTP(S) server"
+msgstr "A lightweight single-threaded HTTP(S) server"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:20
+msgid "Advanced Settings"
+msgstr "Advanced Settings"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:135
+msgid "Aliases"
+msgstr "Aliases"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:149
+msgid "Base directory for files to be served"
+msgstr "Base directory for files to be served"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:22
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:50
+msgid "Bind to specific interface:port (by specifying interface address"
+msgstr "Bind to specific interface:port (by specifying interface address"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:126
+msgid "CGI filetype handler"
+msgstr "CGI filetype handler"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:153
+msgid "CGI is disabled if not present."
+msgstr "CGI is disabled if not present."
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:142
+msgid "Config file (e.g. for credentials for Basic Auth)"
+msgstr "Config file (e.g. for credentials for Basic Auth)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:187
+msgid "Connection reuse"
+msgstr "Connection reuse"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:221
+msgid "Country"
+msgstr "Country"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:173
+msgid "Disable JSON-RPC authorization via ubus session API"
+msgstr "Disable JSON-RPC authorization via ubus session API"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:129
+msgid "Do not follow symlinks outside document root"
+msgstr "Do not follow symlinks outside document root"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:132
+msgid "Do not generate directory listings."
+msgstr "Do not generate directory listings."
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:148
+msgid "Document root"
+msgstr "Document root"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:122
+msgid "E.g specify with index.html and index.php when using PHP"
+msgstr "E.g specify with index.html and index.php when using PHP"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:160
+msgid "Embedded Lua interpreter is disabled if not present."
+msgstr "Embedded Lua interpreter is disabled if not present."
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:169
+msgid "Enable JSON-RPC Cross-Origin Resource Support"
+msgstr "Enable JSON-RPC Cross-Origin Resource Support"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:19
+msgid "For settings primarily geared to serving more than the web UI"
+msgstr "For settings primarily geared to serving more than the web UI"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:19
+msgid "Full Web Server Settings"
+msgstr "Full Web Server Settings"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:160
+msgid "Full real path to handler for Lua scripts"
+msgstr "Full real path to handler for Lua scripts"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:18
+msgid "General Settings"
+msgstr "General Settings"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:22
+msgid "HTTP listeners (address:port)"
+msgstr "HTTP listeners (address:port)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:94
+msgid "HTTPS Certificate (DER Encoded)"
+msgstr "HTTPS Certificate (DER Encoded)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:96
+msgid "HTTPS Private Key (DER Encoded)"
+msgstr "HTTPS Private Key (DER Encoded)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:50
+msgid "HTTPS listener (address:port)"
+msgstr "HTTPS listener (address:port)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:90
+msgid "Ignore private IPs on public interface"
+msgstr "Ignore private IPs on public interface"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:122
+msgid "Index page(s)"
+msgstr "Index page(s)"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:126
+msgid ""
+"Interpreter to associate with file endings ('suffix=handler', e.g. '.php=/"
+"usr/bin/php-cgi')"
+msgstr ""
+"Interpreter to associate with file endings ('suffix=handler', e.g. '.php=/"
+"usr/bin/php-cgi')"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:214
+msgid "Length of key in bits"
+msgstr "Length of key in bits"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:227
+msgid "Location"
+msgstr "Location"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:197
+msgid "Maximum number of connections"
+msgstr "Maximum number of connections"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:201
+msgid "Maximum number of script requests"
+msgstr "Maximum number of script requests"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:177
+msgid "Maximum wait time for Lua, CGI, or ubus execution"
+msgstr "Maximum wait time for Lua, CGI, or ubus execution"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:182
+msgid "Maximum wait time for network activity"
+msgstr "Maximum wait time for network activity"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:166
+msgid "Override path for ubus socket"
+msgstr "Override path for ubus socket"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:153
+msgid "Path prefix for CGI scripts"
+msgstr "Path prefix for CGI scripts"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:90
+msgid ""
+"Prevent access from private (RFC1918) IPs on an interface if it has an "
+"public IP address"
+msgstr ""
+"Prevent access from private (RFC1918) IPs on an interface if it has an "
+"public IP address"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:138
+msgid "Realm for Basic Auth"
+msgstr "Realm for Basic Auth"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:86
+msgid "Redirect all HTTP to HTTPS"
+msgstr "Redirect all HTTP to HTTPS"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:109
+msgid "Remove configuration for certificate and key"
+msgstr "Remove configuration for certificate and key"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:98
+msgid "Remove old certificate and key"
+msgstr "Remove old certificate and key"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:218
+msgid "Server Hostname"
+msgstr "Server Hostname"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:20
+msgid ""
+"Settings which are either rarely needed or which affect serving the WebUI"
+msgstr ""
+"Settings which are either rarely needed or which affect serving the WebUI"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:224
+msgid "State"
+msgstr "State"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:192
+msgid "TCP Keepalive"
+msgstr "TCP Keepalive"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:110
+msgid "This permanently deletes the cert, key, and configuration to use same."
+msgstr "This permanently deletes the cert, key, and configuration to use same."
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:210
+msgid "Valid for # of Days"
+msgstr "Valid for # of Days"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:145
+msgid ""
+"Virtual URL or CGI script to display on status '404 Not Found'. Must begin "
+"with '/'"
+msgstr ""
+"Virtual URL or CGI script to display on status '404 Not Found'. Must begin "
+"with '/'"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:156
+msgid "Virtual path prefix for Lua scripts"
+msgstr "Virtual path prefix for Lua scripts"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:163
+msgid "Virtual path prefix for ubus via JSON-RPC integration"
+msgstr "Virtual path prefix for ubus via JSON-RPC integration"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:142
+msgid "Will not use HTTP authentication if not present"
+msgstr "Will not use HTTP authentication if not present"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:218
+msgid "a.k.a CommonName"
+msgstr "a.k.a CommonName"
+
+#: applications/luci-app-uhttpd/luasrc/controller/uhttpd/uhttpd.lua:13
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:6
+msgid "uHTTPd"
+msgstr "uHTTPd"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:205
+msgid "uHTTPd Self-signed Certificate Parameters"
+msgstr "uHTTPd Self-signed Certificate Parameters"
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:99
+msgid ""
+"uHTTPd will generate a new self-signed certificate using the configuration "
+"shown below."
+msgstr ""
+"uHTTPd will generate a new self-signed certificate using the configuration "
+"shown below."
+
+#: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:163
+msgid "ubus integration is disabled if not present"
+msgstr "ubus integration is disabled if not present"
diff --git a/applications/luci-app-unbound/luasrc/controller/unbound.lua b/applications/luci-app-unbound/luasrc/controller/unbound.lua
index 5e19621842..32879cb9f2 100644
--- a/applications/luci-app-unbound/luasrc/controller/unbound.lua
+++ b/applications/luci-app-unbound/luasrc/controller/unbound.lua
@@ -53,7 +53,7 @@ function index()
call("QueryLocalZone"), _("Local Zones"), 30).leaf = true
entry({"admin", "services", "unbound", "status", "dumpcache"},
- call("QueryCacheDump"), _("Cache Dump"), 40).leaf = true
+ call("QueryDumpCache"), _("DNS Cache"), 40).leaf = true
else
entry({"admin", "services", "unbound", "status", "statistics"},
call("ShowEmpty"), _("Statistics"), 10).leaf = true
@@ -153,17 +153,33 @@ function QueryLocalZone()
{heading = "", description = lcldesc, content = lcldata})
end
-function QueryCacheDump()
+
+function QueryDumpCache()
+ local tp = require "luci.template"
+ local tr = require "luci.i18n"
+ local lcldesc
local lcldata = luci.util.exec(
"unbound-control -c /var/lib/unbound/unbound.conf dump_cache")
- local lcldesc = luci.i18n.translate(
- "This shows Unbound 'cache_dump'. Useful to check if unbound is actually caching dns entities.")
- luci.template.render("unbound/show-textbox",
- {heading = "", description = lcldesc, content = lcldata})
+ if #lcldata > 262144 then
+ lcldesc = tr.translate(
+ "Unbound cache is too large to display in LuCI.")
+
+ tp.render("unbound/show-empty",
+ {heading = "", description = lcldesc})
+
+ else
+ lcldesc = tr.translate(
+ "This shows 'ubound-control dump_cache' for auditing records including DNSSEC.")
+
+ tp.render("unbound/show-textbox",
+ {heading = "", description = lcldesc, content = lcldata})
+ end
+
end
+
function ShowUnboundConf()
local unboundfile = "/var/lib/unbound/unbound.conf"
local lcldata = nixio.fs.readfile(unboundfile)
@@ -196,7 +212,7 @@ function ShowAdblock()
if fs.stat(adblockfile).size > 262144 then
lcldesc = tr.translate(
- "Adblock domain list '" .. adblockfile .. "' is too large for LuCI.")
+ "Adblock domain list is too large to display in LuCI.")
tp.render("unbound/show-empty",
{heading = "", description = lcldesc})
diff --git a/applications/luci-app-unbound/po/zh-cn/unbound.po b/applications/luci-app-unbound/po/zh-cn/unbound.po
new file mode 100644
index 0000000000..a87b74ca78
--- /dev/null
+++ b/applications/luci-app-unbound/po/zh-cn/unbound.po
@@ -0,0 +1,740 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:96
+msgid "(root)"
+msgstr "(根)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:201
+msgid ", and <var>%s</var> entries"
+msgstr "ï¼ŒåŠ <var>%s</var> æ¡ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:172
+msgid ", and try <var>%s</var>"
+msgstr ",并å°è¯• <var>%s</var> "
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:78
+msgid "AXFR"
+msgstr "AXFR"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:59
+msgid "Accept queries only from local subnets"
+msgstr "仅接å—æ¥è‡ªæœ¬åœ°å­ç½‘的查询"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:198
+msgid "Adblock domain list '"
+msgstr "Adblock 域å列表'"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:38
+msgid "Advanced"
+msgstr "高级"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:237
+msgid "Aggressive"
+msgstr "激进"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:34
+msgid "Allow open recursion when record not in zone"
+msgstr "记录ä¸åœ¨åŒºåŸŸä¸­æ—¶å…许递归查询"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:38
+msgid "Authoritative (zone file)"
+msgstr "æƒå¨ï¼ˆåŒºåŸŸæ–‡ä»¶ï¼‰"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:33
+msgid "Basic"
+msgstr "基本"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:242
+msgid "Break down query components for limited added privacy"
+msgstr "细分查询组件以增加有é™çš„éšç§"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:69
+msgid "Break the loop where DNSSEC needs NTP and NTP needs DNS"
+msgstr "打破 DNSSEC éœ€è¦ NTP,NTP åˆéœ€è¦ DNS 的循环"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:56
+msgid "Cache Dump"
+msgstr "缓存转储"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:75
+msgid "Choose Unbounds listening port"
+msgstr "选择 Unbounds 监å¬ç«¯å£"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:213
+msgid "Chose the IP versions used upstream and downstream"
+msgstr "选择上游和下游使用的 IP 版本"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:56
+msgid "Connect to servers using TLS"
+msgstr "使用 TLS 连接到æœåŠ¡å™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:39
+msgid "DHCP"
+msgstr "DHCP"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:131
+msgid "DHCP Link"
+msgstr "DHCP 链接"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:139
+msgid "DHCPv4 to SLAAC"
+msgstr "DHCPv4 到 SLAAC"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:55
+msgid "DNS over TLS"
+msgstr "DNS over TLS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:98
+msgid "DNS64 Prefix"
+msgstr "DNS64 å‰ç¼€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:68
+msgid "DNSSEC NTP Fix"
+msgstr "DNSSEC NTP ä¿®å¤"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:214
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:225
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:235
+msgid "Default"
+msgstr "默认"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:156
+msgid "Denied (nxdomain)"
+msgstr "å¦è®¤ï¼ˆnxdomain)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:22
+msgid "Directed Zone"
+msgstr "转移区域"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:77
+msgid "Directory only part of URL"
+msgstr "目录åªæ˜¯ URL 的一部分"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:106
+msgid "Domain Insecure"
+msgstr "域ä¸å®‰å…¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:72
+msgid "Domain name to verify TLS certificate"
+msgstr "ç”¨äºŽéªŒè¯ TLS è¯ä¹¦çš„域å"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:146
+msgid "Domain suffix for this router and DHCP clients"
+msgstr "此路由器和 DHCP 客户端的域ååŽç¼€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:254
+msgid "EDNS Size"
+msgstr "EDNS 大å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua:14
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua:14
+msgid "Edit '"
+msgstr "编辑'"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua:14
+msgid "Edit 'server:' clause options for 'include:"
+msgstr "编辑“server:â€å­é€‰é¡¹ï¼Œä½äºŽ'include:"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:23
+msgid ""
+"Edit a forward, stub, or zone-file-cache zone for Unbound to use instead of "
+"recursion."
+msgstr "编辑 Unbound 使用的转å‘ã€å­˜æ ¹æˆ–区域文件缓存区域,而ä¸è¿›è¡Œé€’归查询。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua:14
+msgid "Edit clauses such as 'forward-zone:' for 'include:"
+msgstr "编辑å­é€‰é¡¹ï¼Œä¾‹å¦‚“forward-zone:â€ï¼Œä½äºŽ'include:"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:85
+msgid "Edit: Extended"
+msgstr "编辑:扩展"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:82
+msgid "Edit: Server"
+msgstr "编辑:æœåŠ¡å™¨"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:70
+msgid "Edit: UCI"
+msgstr "编辑:UCI"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:77
+msgid "Edit: Unbound"
+msgstr "编辑:Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:39
+msgid "Enable"
+msgstr "å¯ç”¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:93
+msgid "Enable DNS64"
+msgstr "å¯ç”¨ DNS64"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:63
+msgid "Enable DNSSEC"
+msgstr "å¯ç”¨ DNSSEC"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:45
+msgid "Enable Unbound"
+msgstr "å¯ç”¨ Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:203
+msgid "Enable access for unbound-control"
+msgstr "å¯ç”¨ unbound-control 访问"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:94
+msgid "Enable the DNS64 module"
+msgstr "å¯ç”¨ DNS64 模å—"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:64
+msgid "Enable the DNSSEC validator module"
+msgstr "å¯ç”¨ DNSSEC 验è¯æ¨¡å—"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:46
+msgid "Enable the initialization scripts for Unbound"
+msgstr "å¯ç”¨ Unbound çš„åˆå§‹åŒ–脚本"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:30
+msgid "Enable this directed zone"
+msgstr "å¯ç”¨æ­¤è½¬ç§»åŒºåŸŸ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:29
+msgid "Enabled"
+msgstr "å¯ç”¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:266
+msgid "Extended Statistics"
+msgstr "扩展统计"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:267
+msgid "Extended statistics are printed from unbound-control"
+msgstr "扩展统计信æ¯ä»Ž unbound-control 打å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:188
+msgid "Extra DNS"
+msgstr "é¢å¤–çš„ DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:33
+msgid "Fall Back"
+msgstr "回退"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:36
+msgid "Fallback"
+msgstr "回退"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:65
+msgid "Files"
+msgstr "文件"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:90
+msgid "Filter Entire Subnet"
+msgstr "过滤整个å­ç½‘"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:81
+msgid "Filter Localhost Rebind"
+msgstr "过滤本地主机é‡ç»‘定"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:89
+msgid "Filter Private Address"
+msgstr "过滤ç§æœ‰åœ°å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:86
+msgid "Filter Private Rebind"
+msgstr "过滤ç§æœ‰åœ°å€é‡ç»‘定"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:71
+msgid "Forward"
+msgstr "转å‘"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:40
+msgid "Forward (simple handoff)"
+msgstr "转å‘(简å•åˆ‡æ¢ï¼‰"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:68
+msgid "Forward TLS"
+msgstr "è½¬å‘ TLS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:52
+msgid "Forward to upstream nameservers (ISP)"
+msgstr "转å‘到上游å称æœåŠ¡å™¨ï¼ˆISP)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:170
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:182
+msgid "Host FQDN, All Addresses"
+msgstr "主机 FQDN,所有地å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:192
+msgid "Host Records"
+msgstr "主机记录"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:193
+msgid "Host/MX/SRV RR"
+msgstr "主机/MX/SRV RR"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:194
+msgid "Host/MX/SRV/CNAME RR"
+msgstr "主机/MX/SRV/CNAME RR"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:169
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:181
+msgid "Hostname, All Addresses"
+msgstr "主机å,所有地å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:168
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:180
+msgid "Hostname, Primary Address"
+msgstr "主机å,主è¦åœ°å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:165
+msgid "How to enter the LAN or local network router in DNS"
+msgstr "如何在 DNS 中进入 LAN 或本地网络路由器"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:154
+msgid "How to treat queries of this local domain"
+msgstr "如何处ç†æ­¤æœ¬åœ°åŸŸçš„查询"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:216
+msgid "IP4 All and IP6 Local"
+msgstr "所有 IP4 åŠæœ¬åœ° IP6"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:215
+msgid "IP4 Only"
+msgstr "ä»… IP4"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:219
+msgid "IP4 and IP6"
+msgstr "IP4 åŠ IP6"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:217
+msgid "IP6 Only*"
+msgstr "ä»… IP6*"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:218
+msgid "IP6 Preferred"
+msgstr "首选 IP6"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:191
+msgid "Ignore"
+msgstr "忽视"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:171
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:183
+msgid "Interface FQDN, All Addresses"
+msgstr "æŽ¥å£ FQDN,所有地å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:164
+msgid "LAN DNS"
+msgstr "局域网 DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:229
+msgid "Large"
+msgstr "大"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:112
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:273
+msgid "Limit days between RFC5011 copies to reduce flash writes"
+msgstr "é™åˆ¶ RFC5011 副本之间的天数,以å‡å°‘闪存写入"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:255
+msgid "Limit extended DNS packet size"
+msgstr "é™åˆ¶æ‰©å±• DNS æ•°æ®åŒ…大å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:132
+msgid "Link to supported programs to load DHCP into DNS"
+msgstr "链接到支æŒçš„程åºï¼Œä»¥å°† DHCP 加载到 DNS 中"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:107
+msgid "List domains to bypass checks of DNSSEC"
+msgstr "列出è¦ç»•è¿‡ DNSSEC 检查的域å"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:74
+msgid "Listening Port"
+msgstr "监å¬ç«¯å£"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:50
+msgid "Local Data"
+msgstr "本地数æ®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:145
+msgid "Local Domain"
+msgstr "本地域å"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:153
+msgid "Local Domain Type"
+msgstr "本地域å类型"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:207
+msgid "Local Host, Encrypted"
+msgstr "本地主机,加密"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:206
+msgid "Local Host, No Encryption"
+msgstr "本地主机,无加密"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:58
+msgid "Local Service"
+msgstr "本地æœåŠ¡"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:208
+msgid "Local Subnet, Encrypted"
+msgstr "本地å­ç½‘,加密"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:209
+msgid "Local Subnet, Static Encryption"
+msgstr "本地å­ç½‘,é™æ€åŠ å¯†"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:53
+msgid "Local Zones"
+msgstr "本地区域"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:41
+msgid "Log"
+msgstr "日志"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:49
+msgid "Manual Conf"
+msgstr "手动é…ç½®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:228
+msgid "Medium"
+msgstr "介质"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:223
+msgid "Memory Resource"
+msgstr "内存资æº"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:122
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:283
+msgid "Networks that may trigger Unbound to reload (avoid wan6)"
+msgstr "å¯è§¦å‘ Unbound é‡æ–°åŠ è½½çš„网络(é¿å… wan6)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:167
+msgid "No Entry"
+msgstr "æ— æ¡ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:88
+msgid "No Filter"
+msgstr "无过滤器"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:133
+msgid "No Link"
+msgstr "无链接"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:205
+msgid "No Remote Control"
+msgstr "无远程控制"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:45
+msgid ""
+"Note: SSL/TLS library is missing an API. Please review syslog. >> logread ..."
+msgstr "注æ„:SSL/TLS库缺少 API。请查看 syslog。 >> logread ..."
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:16
+msgid ""
+"Organize directed forward, stub, and authoritative zones <a href=\"%s\" "
+"target=\"_blank\">(help)</a>."
+msgstr ""
+"组织转移转å‘ã€å­˜æ ¹å’Œæƒå¨åŒºåŸŸ<a href=\"%s\" target=\"_blank\">(帮助)</a>。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:177
+msgid "Override the WAN side router entry in DNS"
+msgstr "覆盖路由器中的 WAN 端 DNS æ¡ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:236
+msgid "Passive"
+msgstr "被动"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:60
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:66
+msgid "Port servers will receive queries on"
+msgstr "æœåŠ¡å™¨å°†æŽ¥æ”¶æŸ¥è¯¢çš„端å£"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:99
+msgid "Prefix for generated DNS64 addresses"
+msgstr "ç”Ÿæˆ DNS64 地å€çš„å‰ç¼€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:261
+msgid "Prevent excessively short cache periods"
+msgstr "防止缓存期过短"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:82
+msgid "Protect against upstream response of 127.0.0.0/8"
+msgstr "防止 127.0.0.0/8 的上游å“应"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:87
+msgid "Protect against upstream responses within local subnets"
+msgstr "防止本地å­ç½‘内的上游å“应"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:241
+msgid "Query Minimize"
+msgstr "最å°åŒ–查询"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:75
+msgid "Recurse"
+msgstr "递归"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:212
+msgid "Recursion Protocol"
+msgstr "递归åè®®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:233
+msgid "Recursion Strength"
+msgstr "递归强度"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:234
+msgid "Recursion activity affects memory growth and CPU load"
+msgstr "递归活动会增大内存使用和 CPU 负载"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:22
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:22
+msgid "Recursive DNS"
+msgstr "递归 DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:157
+msgid "Refused"
+msgstr "æ‹’ç»"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:40
+msgid "Resource"
+msgstr "资æº"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:111
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:272
+msgid "Root DSKEY Age"
+msgstr "Root DSKEY 年龄"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua:11
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua:11
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua:11
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua:11
+msgid "Save"
+msgstr "ä¿å­˜"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:59
+msgid "Server Port"
+msgstr "æœåŠ¡å™¨ç«¯å£"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:65
+msgid "Server TLS Port"
+msgstr "æœåŠ¡å™¨ TLS 端å£"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:47
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:33
+msgid "Servers"
+msgstr "æœåŠ¡å™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:48
+msgid "Servers for this zone; see README.md for optional form"
+msgstr "该区域的æœåŠ¡å™¨ï¼›æœ‰å…³é€‰é¡¹æ ¼å¼ï¼Œè¯·å‚阅 README.md"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:96
+msgid "Show: Adblock"
+msgstr "显示:Adblock"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:90
+msgid "Show: DHCP"
+msgstr "显示:DHCP"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:73
+msgid "Show: Unbound"
+msgstr "显示:Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:50
+msgid "Skip UCI and use /etc/unbound/unbound.conf"
+msgstr "跳过 UCI 并使用 /etc/unbound/unbound.conf"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:227
+msgid "Small"
+msgstr "å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:158
+msgid "Static (local only)"
+msgstr "é™æ€ï¼ˆä»…é™æœ¬åœ°ï¼‰"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:47
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:59
+msgid "Statistics"
+msgstr "统计"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:38
+msgid "Status"
+msgstr "状æ€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:248
+msgid "Strict Minimize"
+msgstr "严格最å°åŒ–"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:249
+msgid "Strict version of 'query minimize' but it can break DNS"
+msgstr "严格版本的“最å°åŒ–查询â€ï¼Œä½†ä¼šç ´å DNS 标准"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:39
+msgid "Stub (forced recursion)"
+msgstr "存根(强制递归)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:71
+msgid "TLS Name Index"
+msgstr "TLS å称索引"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:260
+msgid "TTL Minimum"
+msgstr "æœ€å° TTL"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:103
+msgid "This could display more statistics with the unbound-control package."
+msgstr "å¯ä»¥ä½¿ç”¨ unbound-control 包显示更多统计信æ¯ã€‚"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:170
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:181
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:206
+msgid "This shows '"
+msgstr "显示'"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:160
+msgid ""
+"This shows Unbound 'cache_dump'. Useful to check if unbound is actually "
+"caching dns entities."
+msgstr "显示 Unbound的“cache_dumpâ€ã€‚用于检查 unbound 是å¦å®žé™…缓存 dns 实体。"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:137
+msgid ""
+"This shows Unbound 'local-data:' entries from default, .conf, or control."
+msgstr "显示æ¥è‡ªé»˜è®¤ã€.conf 或 control çš„ Unbound “local-data:â€æ¡ç›®ã€‚"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:149
+msgid ""
+"This shows Unbound 'local-zone:' entries from default, .conf, or control."
+msgstr "显示æ¥è‡ªé»˜è®¤ã€.conf 或 control çš„ Unbound “local-zone:â€æ¡ç›®ã€‚"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:125
+msgid "This shows Unbound self reported performance statistics."
+msgstr "显示 Unbound 自我报告的性能统计信æ¯ã€‚"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:113
+msgid "This shows syslog filtered for events involving Unbound."
+msgstr "æ˜¾ç¤ºç­›é€‰å‡ºçš„æ¶‰åŠ Unbound 事件的 syslog。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:226
+msgid "Tiny"
+msgstr "å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:159
+msgid "Transparent (local/global)"
+msgstr "é€æ˜Žï¼ˆæœ¬åœ°/å…¨çƒï¼‰"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:121
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:282
+msgid "Trigger Networks"
+msgstr "触å‘网络"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:27
+msgid "Type"
+msgstr "类型"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:26
+msgid "Unbound"
+msgstr "Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:23
+msgid ""
+"Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a> is a validating, "
+"recursive, and caching DNS resolver <a href=\"%s\" target=\"_blank\">(help)</"
+"a>."
+msgstr ""
+"Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a>是一个验è¯ã€é€’归和缓"
+"å­˜ DNS 解æžå™¨<a href=\"%s\" target=\"_blank\">(帮助)</a>。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:202
+msgid "Unbound Control App"
+msgstr "Unbound 控制应用程åº"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:81
+msgid "Undefined"
+msgstr "未定义"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:51
+msgid "Use 'resolv.conf.auto'"
+msgstr "使用“resolv.conf.autoâ€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:140
+msgid "Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)"
+msgstr "使用 DHCPv4 MAC å‘现 IP6 主机 SLAAC(EUI64)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:179
+msgid "Use Upstream"
+msgstr "使用上游"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:189
+msgid "Use extra DNS entries found in /etc/config/dhcp"
+msgstr "使用 /etc/config/dhcp 中的é¢å¤– DNS æ¡ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:224
+msgid "Use menu System/Processes to observe any memory growth"
+msgstr "使用 系统/进程 èœå•è§‚察内存增长"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:176
+msgid "WAN DNS"
+msgstr "WAN DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:44
+msgid "Zone (Domain) names included in this zone combination"
+msgstr "包å«åœ¨æ­¤åŒºåŸŸç»„åˆä¸­çš„区域(域)å称"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:76
+msgid "Zone Download URL"
+msgstr "区域下载 URL"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:43
+msgid "Zone Names"
+msgstr "区域å称"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:37
+msgid "Zone Type"
+msgstr "区域类型"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:32
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:30
+msgid "Zones"
+msgstr "区域"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:112
+msgid "accept upstream results for"
+msgstr "接å—上游结果"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:115
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:276
+msgid "default"
+msgstr "默认"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:175
+msgid "download from <var>%s</var>"
+msgstr "从 <var>%s</var> 下载"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:118
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:279
+msgid "never"
+msgstr "从ä¸"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:118
+msgid "prefetch zone files for"
+msgstr "预å–区域文件,为"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:115
+msgid "select recursion for"
+msgstr "进行递归,为"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:121
+msgid "unknown action for"
+msgstr "未知行为,为"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:205
+msgid "use <var>%s</var> nameservers"
+msgstr "使用 <var>%s</var> å称æœåŠ¡å™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:156
+msgid "use nameservers"
+msgstr "使用å称æœåŠ¡å™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:164
+msgid "with default certificate for <var>%s</var>"
+msgstr "使用 <var>%s</var> 的默认è¯ä¹¦"
diff --git a/applications/luci-app-unbound/po/zh-tw/unbound.po b/applications/luci-app-unbound/po/zh-tw/unbound.po
new file mode 100644
index 0000000000..b51ad0a800
--- /dev/null
+++ b/applications/luci-app-unbound/po/zh-tw/unbound.po
@@ -0,0 +1,740 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:96
+msgid "(root)"
+msgstr "(根)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:201
+msgid ", and <var>%s</var> entries"
+msgstr "ï¼ŒåŠ <var>%s</var> æ¢ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:172
+msgid ", and try <var>%s</var>"
+msgstr ",並嘗試 <var>%s</var> "
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:78
+msgid "AXFR"
+msgstr "AXFR"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:59
+msgid "Accept queries only from local subnets"
+msgstr "僅接å—來自本地å­ç¶²çš„查詢"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:198
+msgid "Adblock domain list '"
+msgstr "Adblock 域å列表'"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:38
+msgid "Advanced"
+msgstr "高階"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:237
+msgid "Aggressive"
+msgstr "激進"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:34
+msgid "Allow open recursion when record not in zone"
+msgstr "記錄ä¸åœ¨å€åŸŸä¸­æ™‚å…許éžè¿´æŸ¥è©¢"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:38
+msgid "Authoritative (zone file)"
+msgstr "權å¨ï¼ˆå€åŸŸæª”案)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:33
+msgid "Basic"
+msgstr "基本"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:242
+msgid "Break down query components for limited added privacy"
+msgstr "細分查詢元件以增加有é™çš„éš±ç§"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:69
+msgid "Break the loop where DNSSEC needs NTP and NTP needs DNS"
+msgstr "打破 DNSSEC éœ€è¦ NTP,NTP åˆéœ€è¦ DNS 的迴圈"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:56
+msgid "Cache Dump"
+msgstr "å¿«å–轉儲"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:75
+msgid "Choose Unbounds listening port"
+msgstr "é¸æ“‡ Unbounds 監è½åŸ "
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:213
+msgid "Chose the IP versions used upstream and downstream"
+msgstr "é¸æ“‡ä¸Šæ¸¸å’Œä¸‹æ¸¸ä½¿ç”¨çš„ IP 版本"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:56
+msgid "Connect to servers using TLS"
+msgstr "使用 TLS 連線到伺æœå™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:39
+msgid "DHCP"
+msgstr "DHCP"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:131
+msgid "DHCP Link"
+msgstr "DHCP 連çµ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:139
+msgid "DHCPv4 to SLAAC"
+msgstr "DHCPv4 到 SLAAC"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:55
+msgid "DNS over TLS"
+msgstr "DNS over TLS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:98
+msgid "DNS64 Prefix"
+msgstr "DNS64 字首"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:68
+msgid "DNSSEC NTP Fix"
+msgstr "DNSSEC NTP 修復"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:214
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:225
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:235
+msgid "Default"
+msgstr "é è¨­"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:156
+msgid "Denied (nxdomain)"
+msgstr "å¦èªï¼ˆnxdomain)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:22
+msgid "Directed Zone"
+msgstr "轉移å€åŸŸ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:77
+msgid "Directory only part of URL"
+msgstr "目錄åªæ˜¯ URL 的一部分"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:106
+msgid "Domain Insecure"
+msgstr "域ä¸å®‰å…¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:72
+msgid "Domain name to verify TLS certificate"
+msgstr "用於驗證 TLS 證書的域å"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:146
+msgid "Domain suffix for this router and DHCP clients"
+msgstr "此路由器和 DHCP 客戶端的域åå­—å°¾"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:254
+msgid "EDNS Size"
+msgstr "EDNS 大å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua:14
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua:14
+msgid "Edit '"
+msgstr "編輯'"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua:14
+msgid "Edit 'server:' clause options for 'include:"
+msgstr "編輯“server:â€å­é¸é …,ä½æ–¼'include:"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:23
+msgid ""
+"Edit a forward, stub, or zone-file-cache zone for Unbound to use instead of "
+"recursion."
+msgstr "編輯 Unbound 使用的轉發ã€å­˜æ ¹æˆ–å€åŸŸæª”案快å–å€åŸŸï¼Œè€Œä¸é€²è¡Œéžè¿´æŸ¥è©¢ã€‚"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua:14
+msgid "Edit clauses such as 'forward-zone:' for 'include:"
+msgstr "編輯å­é¸é …,例如“forward-zone:â€ï¼Œä½æ–¼'include:"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:85
+msgid "Edit: Extended"
+msgstr "編輯:擴充套件"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:82
+msgid "Edit: Server"
+msgstr "編輯:伺æœå™¨"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:70
+msgid "Edit: UCI"
+msgstr "編輯:UCI"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:77
+msgid "Edit: Unbound"
+msgstr "編輯:Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:39
+msgid "Enable"
+msgstr "啟用"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:93
+msgid "Enable DNS64"
+msgstr "啟用 DNS64"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:63
+msgid "Enable DNSSEC"
+msgstr "啟用 DNSSEC"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:45
+msgid "Enable Unbound"
+msgstr "啟用 Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:203
+msgid "Enable access for unbound-control"
+msgstr "啟用 unbound-control 訪å•"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:94
+msgid "Enable the DNS64 module"
+msgstr "啟用 DNS64 模組"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:64
+msgid "Enable the DNSSEC validator module"
+msgstr "啟用 DNSSEC 驗證模組"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:46
+msgid "Enable the initialization scripts for Unbound"
+msgstr "啟用 Unbound çš„åˆå§‹åŒ–指令碼"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:30
+msgid "Enable this directed zone"
+msgstr "啟用此轉移å€åŸŸ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:29
+msgid "Enabled"
+msgstr "啟用"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:266
+msgid "Extended Statistics"
+msgstr "擴充套件統計"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:267
+msgid "Extended statistics are printed from unbound-control"
+msgstr "擴充套件統計資訊從 unbound-control 列å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:188
+msgid "Extra DNS"
+msgstr "é¡å¤–çš„ DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:33
+msgid "Fall Back"
+msgstr "回退"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:36
+msgid "Fallback"
+msgstr "回退"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:65
+msgid "Files"
+msgstr "檔案"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:90
+msgid "Filter Entire Subnet"
+msgstr "éŽæ¿¾æ•´å€‹å­ç¶²"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:81
+msgid "Filter Localhost Rebind"
+msgstr "éŽæ¿¾æœ¬åœ°ä¸»æ©Ÿé‡ç¹«çµ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:89
+msgid "Filter Private Address"
+msgstr "éŽæ¿¾ç§æœ‰åœ°å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:86
+msgid "Filter Private Rebind"
+msgstr "éŽæ¿¾ç§æœ‰åœ°å€é‡ç¹«çµ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:71
+msgid "Forward"
+msgstr "轉發"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:40
+msgid "Forward (simple handoff)"
+msgstr "轉發(簡單切æ›ï¼‰"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:68
+msgid "Forward TLS"
+msgstr "轉發 TLS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:52
+msgid "Forward to upstream nameservers (ISP)"
+msgstr "轉發到上游å稱伺æœå™¨ï¼ˆISP)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:170
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:182
+msgid "Host FQDN, All Addresses"
+msgstr "主機 FQDN,所有地å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:192
+msgid "Host Records"
+msgstr "主機記錄"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:193
+msgid "Host/MX/SRV RR"
+msgstr "主機/MX/SRV RR"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:194
+msgid "Host/MX/SRV/CNAME RR"
+msgstr "主機/MX/SRV/CNAME RR"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:169
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:181
+msgid "Hostname, All Addresses"
+msgstr "主機å,所有地å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:168
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:180
+msgid "Hostname, Primary Address"
+msgstr "主機å,主è¦åœ°å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:165
+msgid "How to enter the LAN or local network router in DNS"
+msgstr "如何在 DNS 中進入 LAN 或本地網路路由器"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:154
+msgid "How to treat queries of this local domain"
+msgstr "如何處ç†æ­¤æœ¬åœ°åŸŸçš„查詢"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:216
+msgid "IP4 All and IP6 Local"
+msgstr "所有 IP4 åŠæœ¬åœ° IP6"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:215
+msgid "IP4 Only"
+msgstr "僅 IP4"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:219
+msgid "IP4 and IP6"
+msgstr "IP4 åŠ IP6"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:217
+msgid "IP6 Only*"
+msgstr "僅 IP6*"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:218
+msgid "IP6 Preferred"
+msgstr "é¦–é¸ IP6"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:191
+msgid "Ignore"
+msgstr "忽視"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:171
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:183
+msgid "Interface FQDN, All Addresses"
+msgstr "ä»‹é¢ FQDN,所有地å€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:164
+msgid "LAN DNS"
+msgstr "å€åŸŸç¶² DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:229
+msgid "Large"
+msgstr "大"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:112
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:273
+msgid "Limit days between RFC5011 copies to reduce flash writes"
+msgstr "é™åˆ¶ RFC5011 副本之間的天數,以減少快閃記憶體寫入"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:255
+msgid "Limit extended DNS packet size"
+msgstr "é™åˆ¶æ“´å……套件 DNS 資料包大å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:132
+msgid "Link to supported programs to load DHCP into DNS"
+msgstr "連çµåˆ°æ”¯æ´çš„程å¼ï¼Œä»¥å°‡ DHCP 載入到 DNS 中"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:107
+msgid "List domains to bypass checks of DNSSEC"
+msgstr "列出è¦ç¹žéŽ DNSSEC 檢查的域å"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:74
+msgid "Listening Port"
+msgstr "監è½åŸ "
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:50
+msgid "Local Data"
+msgstr "本地資料"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:145
+msgid "Local Domain"
+msgstr "本地域å"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:153
+msgid "Local Domain Type"
+msgstr "本地域å型別"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:207
+msgid "Local Host, Encrypted"
+msgstr "本地主機,加密"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:206
+msgid "Local Host, No Encryption"
+msgstr "本地主機,無加密"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:58
+msgid "Local Service"
+msgstr "本地æœå‹™"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:208
+msgid "Local Subnet, Encrypted"
+msgstr "本地å­ç¶²ï¼ŒåŠ å¯†"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:209
+msgid "Local Subnet, Static Encryption"
+msgstr "本地å­ç¶²ï¼Œéœæ…‹åŠ å¯†"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:53
+msgid "Local Zones"
+msgstr "本地å€åŸŸ"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:41
+msgid "Log"
+msgstr "日誌"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:49
+msgid "Manual Conf"
+msgstr "手動é…ç½®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:228
+msgid "Medium"
+msgstr "介質"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:223
+msgid "Memory Resource"
+msgstr "記憶體資æº"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:122
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:283
+msgid "Networks that may trigger Unbound to reload (avoid wan6)"
+msgstr "å¯è§¸ç™¼ Unbound é‡æ–°è¼‰å…¥çš„網路(é¿å… wan6)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:167
+msgid "No Entry"
+msgstr "ç„¡æ¢ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:88
+msgid "No Filter"
+msgstr "ç„¡éŽæ¿¾å™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:133
+msgid "No Link"
+msgstr "無連çµ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:205
+msgid "No Remote Control"
+msgstr "ç„¡é ç«¯æŽ§åˆ¶"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:45
+msgid ""
+"Note: SSL/TLS library is missing an API. Please review syslog. >> logread ..."
+msgstr "注æ„:SSL/TLS庫缺少 API。請檢視 syslog。 >> logread ..."
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:16
+msgid ""
+"Organize directed forward, stub, and authoritative zones <a href=\"%s\" "
+"target=\"_blank\">(help)</a>."
+msgstr ""
+"組織轉移轉發ã€å­˜æ ¹å’Œæ¬Šå¨å€åŸŸ<a href=\"%s\" target=\"_blank\">(幫助)</a>。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:177
+msgid "Override the WAN side router entry in DNS"
+msgstr "覆蓋路由器中的 WAN 端 DNS æ¢ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:236
+msgid "Passive"
+msgstr "被動"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:60
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:66
+msgid "Port servers will receive queries on"
+msgstr "伺æœå™¨å°‡æŽ¥æ”¶æŸ¥è©¢çš„埠"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:99
+msgid "Prefix for generated DNS64 addresses"
+msgstr "ç”Ÿæˆ DNS64 地å€çš„字首"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:261
+msgid "Prevent excessively short cache periods"
+msgstr "防止快å–期éŽçŸ­"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:82
+msgid "Protect against upstream response of 127.0.0.0/8"
+msgstr "防止 127.0.0.0/8 的上游響應"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:87
+msgid "Protect against upstream responses within local subnets"
+msgstr "防止本地å­ç¶²å…§çš„上游響應"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:241
+msgid "Query Minimize"
+msgstr "最å°åŒ–查詢"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:75
+msgid "Recurse"
+msgstr "éžè¿´"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:212
+msgid "Recursion Protocol"
+msgstr "éžè¿´å”è­°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:233
+msgid "Recursion Strength"
+msgstr "éžè¿´å¼·åº¦"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:234
+msgid "Recursion activity affects memory growth and CPU load"
+msgstr "éžè¿´æ´»å‹•æœƒå¢žå¤§è¨˜æ†¶é«”使用和 CPU 負載"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:22
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:22
+msgid "Recursive DNS"
+msgstr "éžè¿´ DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:157
+msgid "Refused"
+msgstr "拒絕"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:40
+msgid "Resource"
+msgstr "資æº"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:111
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:272
+msgid "Root DSKEY Age"
+msgstr "Root DSKEY 年齡"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/extended.lua:11
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/manual.lua:11
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua:11
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua:11
+msgid "Save"
+msgstr "儲存"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:59
+msgid "Server Port"
+msgstr "伺æœå™¨åŸ "
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:65
+msgid "Server TLS Port"
+msgstr "伺æœå™¨ TLS 埠"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:47
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:33
+msgid "Servers"
+msgstr "伺æœå™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:48
+msgid "Servers for this zone; see README.md for optional form"
+msgstr "該å€åŸŸçš„伺æœå™¨ï¼›æœ‰é—œé¸é …æ ¼å¼ï¼Œè«‹åƒé–± README.md"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:96
+msgid "Show: Adblock"
+msgstr "顯示:Adblock"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:90
+msgid "Show: DHCP"
+msgstr "顯示:DHCP"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:73
+msgid "Show: Unbound"
+msgstr "顯示:Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:50
+msgid "Skip UCI and use /etc/unbound/unbound.conf"
+msgstr "è·³éŽ UCI 並使用 /etc/unbound/unbound.conf"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:227
+msgid "Small"
+msgstr "å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:158
+msgid "Static (local only)"
+msgstr "éœæ…‹ï¼ˆåƒ…é™æœ¬åœ°ï¼‰"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:47
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:59
+msgid "Statistics"
+msgstr "統計"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:38
+msgid "Status"
+msgstr "狀態"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:248
+msgid "Strict Minimize"
+msgstr "嚴格最å°åŒ–"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:249
+msgid "Strict version of 'query minimize' but it can break DNS"
+msgstr "嚴格版本的“最å°åŒ–查詢â€ï¼Œä½†æœƒç ´å£ž DNS 標準"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:39
+msgid "Stub (forced recursion)"
+msgstr "存根(強制éžè¿´ï¼‰"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:71
+msgid "TLS Name Index"
+msgstr "TLS å稱索引"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:260
+msgid "TTL Minimum"
+msgstr "æœ€å° TTL"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:103
+msgid "This could display more statistics with the unbound-control package."
+msgstr "å¯ä»¥ä½¿ç”¨ unbound-control 包顯示更多統計資訊。"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:170
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:181
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:206
+msgid "This shows '"
+msgstr "顯示'"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:160
+msgid ""
+"This shows Unbound 'cache_dump'. Useful to check if unbound is actually "
+"caching dns entities."
+msgstr "顯示 Unbound的“cache_dumpâ€ã€‚用於檢查 unbound 是å¦å¯¦éš›å¿«å– dns 實體。"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:137
+msgid ""
+"This shows Unbound 'local-data:' entries from default, .conf, or control."
+msgstr "顯示來自é è¨­ã€.conf 或 control çš„ Unbound “local-data:â€æ¢ç›®ã€‚"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:149
+msgid ""
+"This shows Unbound 'local-zone:' entries from default, .conf, or control."
+msgstr "顯示來自é è¨­ã€.conf 或 control çš„ Unbound “local-zone:â€æ¢ç›®ã€‚"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:125
+msgid "This shows Unbound self reported performance statistics."
+msgstr "顯示 Unbound 自我報告的效能統計資訊。"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:113
+msgid "This shows syslog filtered for events involving Unbound."
+msgstr "顯示篩é¸å‡ºçš„æ¶‰åŠ Unbound 事件的 syslog。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:226
+msgid "Tiny"
+msgstr "å°"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:159
+msgid "Transparent (local/global)"
+msgstr "é€æ˜Žï¼ˆæœ¬åœ°/å…¨çƒï¼‰"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:121
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:282
+msgid "Trigger Networks"
+msgstr "觸發網路"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:27
+msgid "Type"
+msgstr "型別"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:26
+msgid "Unbound"
+msgstr "Unbound"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:23
+msgid ""
+"Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a> is a validating, "
+"recursive, and caching DNS resolver <a href=\"%s\" target=\"_blank\">(help)</"
+"a>."
+msgstr ""
+"Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a>是一個驗證ã€éžè¿´å’Œç·©"
+"å­˜ DNS 解æžå™¨<a href=\"%s\" target=\"_blank\">(幫助)</a>。"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:202
+msgid "Unbound Control App"
+msgstr "Unbound 控制應用程å¼"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:81
+msgid "Undefined"
+msgstr "未定義"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:51
+msgid "Use 'resolv.conf.auto'"
+msgstr "使用“resolv.conf.autoâ€"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:140
+msgid "Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)"
+msgstr "使用 DHCPv4 MAC ç™¼ç¾ IP6 主機 SLAAC(EUI64)"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:179
+msgid "Use Upstream"
+msgstr "使用上游"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:189
+msgid "Use extra DNS entries found in /etc/config/dhcp"
+msgstr "使用 /etc/config/dhcp 中的é¡å¤– DNS æ¢ç›®"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:224
+msgid "Use menu System/Processes to observe any memory growth"
+msgstr "使用 系統/ç¨‹åº é¸å–®è§€å¯Ÿè¨˜æ†¶é«”增長"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:176
+msgid "WAN DNS"
+msgstr "WAN DNS"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:44
+msgid "Zone (Domain) names included in this zone combination"
+msgstr "包å«åœ¨æ­¤å€åŸŸçµ„åˆä¸­çš„å€åŸŸï¼ˆåŸŸï¼‰å稱"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:76
+msgid "Zone Download URL"
+msgstr "å€åŸŸä¸‹è¼‰ URL"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:43
+msgid "Zone Names"
+msgstr "å€åŸŸå稱"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:37
+msgid "Zone Type"
+msgstr "å€åŸŸåž‹åˆ¥"
+
+#: applications/luci-app-unbound/luasrc/controller/unbound.lua:32
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:30
+msgid "Zones"
+msgstr "å€åŸŸ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:112
+msgid "accept upstream results for"
+msgstr "接å—上游çµæžœ"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:115
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:276
+msgid "default"
+msgstr "é è¨­"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:175
+msgid "download from <var>%s</var>"
+msgstr "從 <var>%s</var> 下載"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:118
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:279
+msgid "never"
+msgstr "從ä¸"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:118
+msgid "prefetch zone files for"
+msgstr "é å–å€åŸŸæª”案,為"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:115
+msgid "select recursion for"
+msgstr "進行éžè¿´ï¼Œç‚º"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:121
+msgid "unknown action for"
+msgstr "未知行為,為"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:205
+msgid "use <var>%s</var> nameservers"
+msgstr "使用 <var>%s</var> å稱伺æœå™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:156
+msgid "use nameservers"
+msgstr "使用å稱伺æœå™¨"
+
+#: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:164
+msgid "with default certificate for <var>%s</var>"
+msgstr "使用 <var>%s</var> çš„é è¨­è­‰æ›¸"
diff --git a/applications/luci-app-wireguard/po/zh-cn/wireguard.po b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
index 3d173e596b..1c5d2410de 100644
--- a/applications/luci-app-wireguard/po/zh-cn/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
@@ -1,16 +1,16 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2018-2019.
#
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2018-08-07 20:23+0800\n"
+"PO-Revision-Date: 2019-01-03 20:51+0800\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: zh_CN\n"
@@ -79,7 +79,7 @@ msgstr "公钥"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
msgid "Show/Hide QR-Code"
-msgstr ""
+msgstr "显示/éšè— QR ç "
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
diff --git a/applications/luci-app-wireguard/po/zh-tw/wireguard.po b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
index 84953036e6..53f26d9faa 100644
--- a/applications/luci-app-wireguard/po/zh-tw/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
@@ -1,19 +1,19 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2018.
+# Yangfl <mmyangfl@gmail.com>, 2018-2019.
#
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2018-08-07 20:23+0800\n"
+"PO-Revision-Date: 2019-01-03 20:51+0800\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_TW\n"
+"Language: zh_CN\n"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:157
msgid "Allowed IPs"
@@ -79,7 +79,7 @@ msgstr "公鑰"
#: applications/luci-app-wireguard/luasrc/view/wireguard.htm:199
msgid "Show/Hide QR-Code"
-msgstr ""
+msgstr "顯示/éš±è— QR 碼"
#: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
msgid "WireGuard Status"
diff --git a/build/i18n-add-language.sh b/build/i18n-add-language.sh
new file mode 100755
index 0000000000..24203c2331
--- /dev/null
+++ b/build/i18n-add-language.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+LANG=$1
+
+case "$LANG" in
+ [a-z][a-z]|[a-z][a-z]-[a-z][a-z]) : ;;
+ *)
+ echo "Usage: $0 <ISO_CODE>\n" >&2
+ exit 1
+ ;;
+esac
+
+ADDED=0
+
+for podir in ./*/*/po; do
+ [ -d "$podir/templates" ] || continue
+
+ mkdir "$podir/$LANG"
+ for catalog in $(cd "$podir/templates"; echo *.pot); do
+ if [ -f "$podir/templates/$catalog" -a ! -f "$podir/$LANG/${catalog%.pot}.po" ]; then
+ msginit --no-translator -l "$LANG" -i "$podir/templates/$catalog" -o "$podir/$LANG/${catalog%.pot}.po"
+ git add "$podir/$LANG/${catalog%.pot}.po"
+ ADDED=$((ADDED + 1))
+ fi
+ done
+done
+
+if [ $ADDED -gt 0 ]; then
+ echo ""
+ echo "Added $ADDED new translation catalogs for language '$LANG'."
+ echo "Please also edit 'luci.mk' and add"
+ echo ""
+ echo " LUCI_LANG.$LANG=Native Language Name"
+ echo ""
+ echo "to properly package the translation files."
+ echo ""
+fi
diff --git a/documentation/CBI.md b/documentation/CBI.md
index d4bc4c34e5..933380d22f 100644
--- a/documentation/CBI.md
+++ b/documentation/CBI.md
@@ -12,7 +12,7 @@ This Reference covers **the basics** of the CBI system.
## class Map (_config, title, description_)
This is the root object of the model.
-* **config:** configuration filename to be mapped, see [UCI documentation](http://wiki.openwrt.org/doc/uci) and the files in /etc/config
+* **config:** configuration filename to be mapped, see [UCI documentation](https://openwrt.org/docs/guide-user/base-system/uci) and the files in /etc/config
* **title:** title shown in the UI
* **description:** description shown in the UI
diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js
index f93c9351a7..67ddc6af36 100644
--- a/modules/luci-base/htdocs/luci-static/resources/cbi.js
+++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js
@@ -443,10 +443,10 @@ var CBIValidatorPrototype = {
m6 = this.value.match((bracket == 1) ? /^\[(.+)\]:(\d+)$/ : /^([^\[\]]+):(\d+)$/);
if (m4)
- return this.assert(this.apply('ip4addr', m4[0], [true]) && this.apply('port', m4[1]),
+ return this.assert(this.apply('ip4addr', m4[1], [true]) && this.apply('port', m4[2]),
_('valid address:port'));
- return this.assert(m6 && this.apply('ip6addr', m6[0], [true]) && this.apply('port', m6[1]),
+ return this.assert(m6 && this.apply('ip6addr', m6[1], [true]) && this.apply('port', m6[2]),
_('valid address:port'));
},
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index c6f4477dff..39fd4a3c89 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -16,14 +16,12 @@ TZ = {
{ 'Africa/Brazzaville', 'WAT-1' },
{ 'Africa/Bujumbura', 'CAT-2' },
{ 'Africa/Cairo', 'EET-2' },
- { 'Africa/Casablanca', '<+01>-1' },
{ 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
{ 'Africa/Conakry', 'GMT0' },
{ 'Africa/Dakar', 'GMT0' },
{ 'Africa/Dar es Salaam', 'EAT-3' },
{ 'Africa/Djibouti', 'EAT-3' },
{ 'Africa/Douala', 'WAT-1' },
- { 'Africa/El Aaiun', '<+01>-1' },
{ 'Africa/Freetown', 'GMT0' },
{ 'Africa/Gaborone', 'CAT-2' },
{ 'Africa/Harare', 'CAT-2' },
@@ -51,7 +49,7 @@ TZ = {
{ 'Africa/Nouakchott', 'GMT0' },
{ 'Africa/Ouagadougou', 'GMT0' },
{ 'Africa/Porto-Novo', 'WAT-1' },
- { 'Africa/Sao Tome', 'WAT-1' },
+ { 'Africa/Sao Tome', 'GMT0' },
{ 'Africa/Tripoli', 'EET-2' },
{ 'Africa/Tunis', 'CET-1' },
{ 'Africa/Windhoek', 'CAT-2' },
@@ -272,7 +270,8 @@ TZ = {
{ 'Asia/Pontianak', 'WIB-7' },
{ 'Asia/Pyongyang', 'KST-9' },
{ 'Asia/Qatar', '<+03>-3' },
- { 'Asia/Qyzylorda', '<+06>-6' },
+ { 'Asia/Qostanay', '<+06>-6' },
+ { 'Asia/Qyzylorda', '<+05>-5' },
{ 'Asia/Riyadh', '<+03>-3' },
{ 'Asia/Sakhalin', '<+11>-11' },
{ 'Asia/Samarkand', '<+05>-5' },
@@ -283,7 +282,7 @@ TZ = {
{ 'Asia/Taipei', 'CST-8' },
{ 'Asia/Tashkent', '<+05>-5' },
{ 'Asia/Tbilisi', '<+04>-4' },
- { 'Asia/Tehran', '<+0330>-3:30<+0430>,J80/0,J264/0' },
+ { 'Asia/Tehran', '<+0330>-3:30<+0430>,J79/24,J263/24' },
{ 'Asia/Thimphu', '<+06>-6' },
{ 'Asia/Tokyo', 'JST-9' },
{ 'Asia/Tomsk', '<+07>-7' },
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 5bdfb738f0..801f395d1d 100644
--- a/modules/luci-base/po/pl/base.po
+++ b/modules/luci-base/po/pl/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: LuCI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-20 09:40+0200\n"
-"PO-Revision-Date: 2018-09-02 15:25+0200\n"
+"PO-Revision-Date: 2019-01-05 19:30+0200\n"
"Last-Translator: Rixerx <krystian.kozak20@gmail.com>\n"
"Language-Team: Polish\n"
"Language: pl\n"
@@ -24,7 +24,7 @@ msgstr ""
#: modules/luci-base/htdocs/luci-static/resources/luci.js:307
msgid "%d invalid field(s)"
-msgstr ""
+msgstr "%d nieprawidłowe pole(pola)"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:256
msgid "%s is untagged in multiple VLANs!"
@@ -241,7 +241,7 @@ msgstr ""
#: modules/luci-base/htdocs/luci-static/resources/xhr.js:39
msgid "A new login is required since the authentication session expired."
-msgstr ""
+msgstr "Wymagane jest ponowne zalogowanie ponieważ sesja wygasła."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:114
msgid "A43C + J43 + A43"
@@ -365,18 +365,18 @@ msgstr "Dodaj"
#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:60
msgid "Add IPv4 address…"
-msgstr ""
+msgstr "Dodaj adres IPv4…"
#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:129
msgid "Add IPv6 address…"
-msgstr ""
+msgstr "Dodaj adres IPv6…"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:143
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:149
#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:38
msgid "Add key"
-msgstr ""
+msgstr "Dodaj klucz"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:109
msgid "Add local domain suffix to names served from hosts files"
@@ -507,11 +507,11 @@ msgstr "Zawsze rozgłaszaj domyślny router"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
msgid "Always off (%s)"
-msgstr ""
+msgstr "Zawsze wyłączony (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
msgid "Always on (%s)"
-msgstr ""
+msgstr "Zawsze włączony (%s)"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
msgid ""
@@ -628,11 +628,11 @@ msgstr "Dowolna strefa"
#: modules/luci-base/luasrc/view/cbi/apply_widget.htm:48
msgid "Apply anyway"
-msgstr ""
+msgstr "Zatwierdź mimo to"
#: modules/luci-base/luasrc/view/cbi/apply_widget.htm:145
msgid "Apply request failed with status <code>%h</code>"
-msgstr ""
+msgstr "Żądanie zatwierdzenia nie powiodło się ze statusem <code>%h</code>"
#: modules/luci-mod-status/luasrc/view/admin_status/index/10-system.htm:19
msgid "Architecture"
@@ -921,7 +921,7 @@ msgstr "ÅaÅ„cuch"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:14
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:24
msgid "Change login password"
-msgstr ""
+msgstr "Zmień hasło logowania"
#: modules/luci-base/luasrc/controller/admin/uci.lua:12
#: modules/luci-base/luasrc/view/admin_uci/changes.htm:16
@@ -942,7 +942,7 @@ msgstr "Zmienia hasło administratora"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
msgid "Changing password…"
-msgstr ""
+msgstr "Zmieniam hasło…"
#: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:157
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
@@ -977,7 +977,7 @@ msgstr "Suma kontrolna"
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:70
msgid "Choose mtdblock"
-msgstr ""
+msgstr "Wybierz mtdblock"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:358
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi_add.lua:87
@@ -1021,6 +1021,8 @@ msgid ""
"Click \"Save mtdblock\" to download specified mtdblock file. (NOTE: THIS "
"FEATURE IS FOR PROFESSIONALS! )"
msgstr ""
+"Kliknij \"Zapisz mtdblock\", aby pobrać określony plik mtdblock. (UWAGA: TA "
+"FUNKCJA JEST DLA PROFESJONALISTÓW! )"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:368
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:461
@@ -1035,7 +1037,7 @@ msgstr "Nazwa (ID) klienta do wysłania podczas negocjacji DHCP"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:145
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:151
msgid "Close"
-msgstr ""
+msgstr "Zamknij"
#: protocols/luci-proto-3g/luasrc/model/cbi/admin_network/proto_3g.lua:146
#: protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua:119
@@ -1077,7 +1079,7 @@ msgstr "Polecenie"
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:64
msgid "Comment"
-msgstr ""
+msgstr "Komentarz"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:185
msgid "Common Configuration"
@@ -1214,7 +1216,7 @@ msgstr ""
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
msgid "Custom flash intervall (%s)"
-msgstr ""
+msgstr "Własny interwał flash (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
msgid ""
@@ -1226,11 +1228,11 @@ msgstr ""
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:760
msgid "DAE-Client"
-msgstr ""
+msgstr "DAE-Klient"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:768
msgid "DAE-Port"
-msgstr ""
+msgstr "DAE-Port"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:776
msgid "DAE-Secret"
@@ -1341,7 +1343,7 @@ msgstr "Domyślne %d"
#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:82
msgid "Default Route"
-msgstr ""
+msgstr "Domyślna ścieżka routingu"
#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_464xlat.lua:17
#: protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua:81
@@ -1382,7 +1384,7 @@ msgstr "Usuń"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:172
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:178
msgid "Delete key"
-msgstr ""
+msgstr "Usuń klucz"
#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:45
msgid "Delete this network"
@@ -1547,7 +1549,7 @@ msgstr "Nie przekazuj odwrotnych lookup`ów do sieci lokalnych"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:173
msgid "Do you really want to delete the following SSH key?"
-msgstr ""
+msgstr "Czy na pewno chcesz usunąć następujący klucz SSH?"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:25
msgid "Domain required"
@@ -1579,7 +1581,7 @@ msgstr "Pobierz kopiÄ™ zapasowÄ…"
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:87
msgid "Download mtdblock"
-msgstr ""
+msgstr "Pobierz mtdblock"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/network.lua:130
msgid "Downstream SNR offset"
@@ -1833,7 +1835,7 @@ msgstr "Rozwiń hosty"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:278
msgid "Expecting %s"
-msgstr ""
+msgstr "Oczekiwano %s"
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/index.js:61
msgid "Expires"
@@ -1982,7 +1984,7 @@ msgstr "Flashowanie..."
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
msgid "Flashmemory write access (%s)"
-msgstr ""
+msgstr "Dostęp do zapisu flashmemory (%s)"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
msgid "Force"
@@ -2176,7 +2178,7 @@ msgstr "Błędy kodu nagłówka (HEC)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
msgid "Heartbeat intervall (%s)"
-msgstr ""
+msgstr "Interwał Heartbeata (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
msgid ""
@@ -2197,7 +2199,7 @@ msgstr ""
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99
#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:61
msgid "Hide empty chains"
-msgstr ""
+msgstr "Ukryj puste łańcuchy"
#: modules/luci-base/luasrc/view/lease_status.htm:86
#: modules/luci-base/luasrc/view/wifi_assoclist.htm:110
@@ -2906,7 +2908,7 @@ msgstr "Åadowanie"
#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
msgid "Loading SSH keys…"
-msgstr ""
+msgstr "Åadowanie kluczy SSH…"
#: modules/luci-base/luasrc/model/network.lua:30
msgid "Local IP address is invalid"
@@ -3330,7 +3332,7 @@ msgstr "Sieciowy obraz startowy"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
msgid "Network device activity (%s)"
-msgstr ""
+msgstr "Aktywność urządzenia sieciowego (%s)"
#: modules/luci-base/luasrc/model/network.lua:33
msgid "Network device is not present"
@@ -3392,11 +3394,11 @@ msgstr "Nie ustawiono hasła!"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:116
msgid "No public keys present yet."
-msgstr ""
+msgstr "Nie ma jeszcze kluczy publicznych."
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:83
msgid "No rules in this chain."
-msgstr "Brak zasad w tym łańcuchu"
+msgstr "Brak zasad w tym łańcuchu."
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_join.js:146
msgid "No scan results available yet..."
@@ -3805,7 +3807,7 @@ msgstr ""
#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:37
msgid "Paste or drag SSH key file…"
-msgstr ""
+msgstr "Wklej lub przeciągnij plik klucza SSH…"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:955
msgid "Path to CA-Certificate"
@@ -4019,6 +4021,10 @@ msgid ""
"device, paste an OpenSSH compatible public key line or drag a <code>.pub</"
"code> file into the input field."
msgstr ""
+"Klucze publiczne pozwalają na logowanie bez haseł SSH z wyższymi zabezpieczeniami "
+"w porównaniu do użycia zwykłych haseł. Aby przesłać nowy klucz do urządzenia, "
+"wklej klucz publiczny zgodny z OpenSSH lub przeciÄ…gnij plik <code>.pub</code> "
+"do pola wejściowego."
#: modules/luci-base/luasrc/model/cbi/admin_network/proto_static.lua:139
msgid "Public prefix routed to this device for distribution to clients."
@@ -4311,7 +4317,7 @@ msgstr "Uruchom ponownie"
#: modules/luci-mod-status/luasrc/view/admin_status/iptables.htm:63
msgid "Restart Firewall"
-msgstr "Uruchom ponownie firewalla"
+msgstr "Uruchom ponownie Firewalla"
#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:14
msgid "Restart radio interface"
@@ -4395,7 +4401,7 @@ msgstr ""
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:240
msgid "Rule"
-msgstr ""
+msgstr "Reguła"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:155
msgid "Run a filesystem check before mounting the device"
@@ -4445,7 +4451,7 @@ msgstr "SSID"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab.lua:236
msgid "SWAP"
-msgstr ""
+msgstr "SWAP"
#: modules/luci-base/luasrc/view/cbi/error.htm:17
#: modules/luci-base/luasrc/view/cbi/footer.htm:26
@@ -4461,11 +4467,11 @@ msgstr "Zapisz i zastosuj"
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:89
msgid "Save mtdblock"
-msgstr ""
+msgstr "Zapisz mtdblock"
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:64
msgid "Save mtdblock contents"
-msgstr ""
+msgstr "Zapisz zawartość mtdblock"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
msgid "Saving keys…"
@@ -4542,7 +4548,7 @@ msgstr "Serwisy"
#: modules/luci-base/htdocs/luci-static/resources/xhr.js:37
msgid "Session expired"
-msgstr ""
+msgstr "Sesja wygasła"
#: protocols/luci-proto-vpnc/luasrc/model/cbi/admin_network/proto_vpnc.lua:83
msgid "Set VPN as Default Route"
@@ -4591,7 +4597,7 @@ msgstr "Pokaż aktualną listę plików do backupu"
#: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:99
msgid "Show empty chains"
-msgstr ""
+msgstr "Pokaż puste łańcuchy"
#: modules/luci-mod-network/luasrc/view/admin_network/iface_overview.htm:35
msgid "Shutdown this interface"
@@ -4777,7 +4783,7 @@ msgstr ""
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:524
msgid "Station inactivity limit"
-msgstr ""
+msgstr "Station inactivity limit"
#: modules/luci-base/luasrc/controller/admin/index.lua:40
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:197
@@ -4809,7 +4815,7 @@ msgstr "Pomiń rejestrowanie rutynowych operacji dla tych protokołów"
#: modules/luci-mod-status/luasrc/view/admin_status/index/20-memory.htm:24
msgid "Swap"
-msgstr ""
+msgstr "Swap"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:29
msgid "Swap Entry"
@@ -4847,11 +4853,11 @@ msgstr "Protokół przełącznika"
#: modules/luci-base/luasrc/view/cbi/ipaddr.htm:26
msgid "Switch to CIDR list notation"
-msgstr ""
+msgstr "Przejdź do notacji listy CIDR"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
msgid "Switchport activity (%s)"
-msgstr ""
+msgstr "Aktywność Switchportu (%s)"
#: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
#: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
@@ -4996,6 +5002,12 @@ msgid ""
"warning and edit changes before attempting to apply again, or revert all "
"pending changes to keep the currently working configuration state."
msgstr ""
+"Nie można uzyskać dostępu do urządzenia w ciągu %d sekund po zastosowaniu "
+"oczekujących zmian, które spowodowały wycofanie konfiguracji ze względów "
+"bezpieczeństwa. Jeśli jednak uważasz, że zmiany konfiguracji są poprawne, "
+"kontynuuj, stosując je mimo to. Możesz też odrzucić to ostrzeżenie i edytować "
+"zmiany przed ponownym zastosowaniem lub odrzucić wszystkie oczekujące zmiany, "
+"aby zachować aktualnie działający stan konfiguracji."
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/mount.lua:87
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/fstab/swap.lua:41
@@ -5037,13 +5049,15 @@ msgstr "Następujące zasady są obecnie aktywne w tym systemie."
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:144
msgid "The given SSH public key has already been added."
-msgstr ""
+msgstr "Podany klucz publiczny SSH został już dodany."
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:150
msgid ""
"The given SSH public key is invalid. Please supply proper public RSA or "
"ECDSA keys."
msgstr ""
+"Podany klucz publiczny SSH jest nieprawidłowy. Podaj odpowiedni publiczny RSA "
+"lub klucze ECDSA."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/iface_add.lua:67
msgid "The given network name is not unique"
@@ -5073,7 +5087,7 @@ msgstr "Długość prefiksu IPv6 w bitach"
#: protocols/luci-proto-ipip/luasrc/model/cbi/admin_network/proto_ipip.lua:12
msgid "The local IPv4 address over which the tunnel is created (optional)."
-msgstr ""
+msgstr "Lokalny adres IPv4, na którym tworzony jest tunel (opcjonalnie)."
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/vlan.lua:5
msgid ""
@@ -5099,7 +5113,7 @@ msgstr "Wybrany protokół potrzebuje przypisanego urządzenia"
#: modules/luci-base/luasrc/view/csrftoken.htm:11
msgid "The submitted security token is invalid or already expired!"
-msgstr ""
+msgstr "The submitted security token is invalid or already expired!"
#: modules/luci-mod-system/luasrc/controller/admin/system.lua:265
msgid ""
@@ -5123,7 +5137,7 @@ msgstr ""
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:15
msgid "The system password has been successfully changed."
-msgstr ""
+msgstr "Hasło systemowe zostało pomyślnie zmienione."
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:118
msgid ""
@@ -5286,7 +5300,7 @@ msgstr "Strefa czasowa"
#: modules/luci-base/htdocs/luci-static/resources/xhr.js:47
msgid "To login…"
-msgstr ""
+msgstr "Zaloguj się…"
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:32
msgid ""
@@ -5450,7 +5464,7 @@ msgstr "Odmontuj"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:107
msgid "Unnamed key"
-msgstr ""
+msgstr "Klucz beznazwy"
#: themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm:148
#: themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm:209
@@ -5787,23 +5801,23 @@ msgstr ""
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
msgid "Wi-Fi activity (%s)"
-msgstr ""
+msgstr "Aktywność Wi-Fi (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
msgid "Wi-Fi client association (%s)"
-msgstr ""
+msgstr "PowiÄ…zanie klienta Wi-Fi (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
msgid "Wi-Fi data reception (%s)"
-msgstr ""
+msgstr "Odbiór danych Wi-Fi (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
msgid "Wi-Fi data transmission (%s)"
-msgstr ""
+msgstr "Transmisja danych Wi-Fi (%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
msgid "Wi-Fi on (%s)"
-msgstr ""
+msgstr "Wi-Fi włączone (%s)"
#: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
msgid "Width"
@@ -5811,7 +5825,7 @@ msgstr "Szerokość"
#: protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua:9
msgid "WireGuard VPN"
-msgstr ""
+msgstr "WireGuard VPN"
#: modules/luci-mod-network/luasrc/controller/admin/network.lua:58
#: modules/luci-mod-status/luasrc/controller/admin/status.lua:28
@@ -5907,19 +5921,19 @@ msgstr ""
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:118
msgid "ZRam Compression Algorithm"
-msgstr ""
+msgstr "Alogrytm kompresji ZRam"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:125
msgid "ZRam Compression Streams"
-msgstr ""
+msgstr "Strumienie kompresji ZRam"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:25
msgid "ZRam Settings"
-msgstr ""
+msgstr "Ustawienia ZRam"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:113
msgid "ZRam Size"
-msgstr ""
+msgstr "Rozmiar ZRam"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:187
msgid "any"
@@ -6080,11 +6094,11 @@ msgstr "kbit/s"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:459
msgid "key between 8 and 63 characters"
-msgstr ""
+msgstr "klucz od 8 do 63 znaków"
#: modules/luci-base/htdocs/luci-static/resources/cbi.js:471
msgid "key with either 5 or 13 characters"
-msgstr ""
+msgstr "klucz z 5 lub 13 znakami"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/dhcp.lua:50
msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index ac57c19da5..5fce99935c 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -1,10 +1,10 @@
#
# Yangfl <mmyangfl@gmail.com>, 2018.
-# Zheng Qian <sotux82@gmail.com>, 2018.
+# Zheng Qian <sotux82@gmail.com>, 2019.
#
msgid ""
msgstr ""
-"PO-Revision-Date: 2018-12-14 09:11+0800\n"
+"PO-Revision-Date: 2019-01-10 16:10+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: \n"
@@ -493,11 +493,11 @@ msgstr "总是通告默认路由"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:50
msgid "Always off (%s)"
-msgstr ""
+msgstr "总是关闭(%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:48
msgid "Always on (%s)"
-msgstr ""
+msgstr "总是开å¯ï¼ˆ%s)"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua:258
msgid ""
@@ -920,7 +920,7 @@ msgstr "更改访问设备的管ç†å‘˜å¯†ç "
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/password.js:10
msgid "Changing password…"
-msgstr "正在更改密ç â€¦â€¦"
+msgstr "正在更改密ç â€¦"
#: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:157
#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js:45
@@ -1184,7 +1184,7 @@ msgstr ""
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:52
msgid "Custom flash intervall (%s)"
-msgstr ""
+msgstr "自定义闪çƒé—´éš”(%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:4
msgid ""
@@ -1935,7 +1935,7 @@ msgstr "正在刷写…"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:60
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:62
msgid "Flashmemory write access (%s)"
-msgstr ""
+msgstr "闪存写访问(%s)"
#: modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua:498
msgid "Force"
@@ -2128,7 +2128,7 @@ msgstr "请求头错误代ç é”™è¯¯ï¼ˆHEC)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:56
msgid "Heartbeat intervall (%s)"
-msgstr ""
+msgstr "心跳间隔(%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/system.lua:14
msgid ""
@@ -2850,7 +2850,7 @@ msgstr "加载中"
#: modules/luci-mod-system/luasrc/view/admin_system/sshkeys.htm:35
msgid "Loading SSH keys…"
-msgstr "正在加载 SSH 密钥……"
+msgstr "正在加载 SSH 密钥…"
#: modules/luci-base/luasrc/model/network.lua:30
msgid "Local IP address is invalid"
@@ -3266,7 +3266,7 @@ msgstr "网络å¯åŠ¨é•œåƒ"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:54
msgid "Network device activity (%s)"
-msgstr ""
+msgstr "网络设备活动(%s)"
#: modules/luci-base/luasrc/model/network.lua:33
msgid "Network device is not present"
@@ -3467,7 +3467,7 @@ msgstr "一个或多个必选项值为空ï¼"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/backupfiles.lua:19
msgid "Open list..."
-msgstr "打开列表……"
+msgstr "打开列表…"
#: protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua:9
msgid "OpenConnect (CISCO AnyConnect)"
@@ -4398,7 +4398,7 @@ msgstr "ä¿å­˜ mtdblock 内容"
#: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:120
msgid "Saving keys…"
-msgstr "正在ä¿å­˜å¯†é’¥â€¦â€¦"
+msgstr "正在ä¿å­˜å¯†é’¥â€¦"
#: modules/luci-mod-network/luasrc/view/admin_network/wifi_overview.htm:15
msgid "Scan"
@@ -4770,7 +4770,7 @@ msgstr "切æ¢åˆ° CIDR 列表记法"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:64
msgid "Switchport activity (%s)"
-msgstr ""
+msgstr "交æ¢å£æ´»åŠ¨ï¼ˆ%s)"
#: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:25
#: modules/luci-mod-system/luasrc/view/admin_system/clock_status.htm:34
@@ -5167,7 +5167,7 @@ msgstr "时区"
#: modules/luci-base/htdocs/luci-static/resources/xhr.js:47
msgid "To login…"
-msgstr "登录……"
+msgstr "去登录…"
#: modules/luci-mod-system/luasrc/view/admin_system/flashops.htm:32
msgid ""
@@ -5665,23 +5665,23 @@ msgstr ""
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:74
msgid "Wi-Fi activity (%s)"
-msgstr ""
+msgstr "Wi-Fi 活动(%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:70
msgid "Wi-Fi client association (%s)"
-msgstr ""
+msgstr "Wi-Fi 客户端关è”(%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:66
msgid "Wi-Fi data reception (%s)"
-msgstr ""
+msgstr "Wi-Fi æ•°æ®æŽ¥æ”¶ï¼ˆ%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:68
msgid "Wi-Fi data transmission (%s)"
-msgstr ""
+msgstr "Wi-Fi æ•°æ®ä¼ è¾“(%s)"
#: modules/luci-mod-system/luasrc/model/cbi/admin_system/leds.lua:72
msgid "Wi-Fi on (%s)"
-msgstr ""
+msgstr "Wi-Fi å¼€å¯ï¼ˆ%s)"
#: modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm:161
msgid "Width"
diff --git a/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua
index b08366de6c..eb0b49b11c 100644
--- a/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua
+++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua
@@ -15,7 +15,7 @@ community.rmempty = false
local profile
for profile in fs.glob(profiles) do
- local name = uci:get_first(profile, "community", "name") or "?"
+ local name = uci:get_first(string.gsub(profile, "/etc/config/", ""), "community", "name") or "?"
community:value(string.gsub(profile, "/etc/config/profile_", ""), name)
end
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm
index e0252ba891..a3f079716c 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/adminindex.htm
@@ -1,22 +1,15 @@
<%+header%>
<%
local uci = require "luci.model.uci".cursor()
-local contact = uci:get_all("freifunk", "contact")
+local nickname = uci:get("freifunk", "contact", "nickname") or ""
+local name = uci:get("freifunk", "contact", "name") or ""
+local mail = uci:get("freifunk", "contact", "mail") or ""
local contacturl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "contact")
local hostname = uci:get_first ("system", "system", "hostname")
local latitude = uci:get_first ("system", "system", "latitude")
local longitude = uci:get_first ("system", "system", "longitude")
local location = uci:get_first ("system", "system", "location")
local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
-local nickname, name, mail
-if not contact then
- nickname, name, mail = ""
-else
- nickname = contact.nickname
- name = contact.name
- mail = contact.mail
-end
-
%>
<h2><%:Freifunk Overview%></h2>
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
index dca35376cb..dececeff51 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/contact.htm
@@ -9,22 +9,15 @@
<%
local uci = require "luci.model.uci".cursor()
-local contact = uci:get_all("freifunk", "contact")
-local nickname, name, mail, phone, location, note
-local lon = uci:get_first("system", "system", "longitude")
-local lat = uci:get_first("system", "system", "latitude")
-
-if not contact then
- nickname, name, homepage, mail, phone, location, note = ""
-else
- nickname = contact.nickname or ""
- name = contact.name or ""
- homepage = contact.homepage or {}
- mail = contact.mail or ""
- phone = contact.phone or ""
- location = uci:get_first("system", "system", "location") or contact.location
- note = contact.note or ""
-end
+local nickname = uci:get("freifunk", "contact", "nickname") or ""
+local name = uci:get("freifunk", "contact", "name") or ""
+local homepage = uci:get("freifunk", "contact", "homepage") or {}
+local mail = uci:get("freifunk", "contact", "mail") or ""
+local phone = uci:get("freifunk", "contact", "phone") or ""
+local location = uci:get_first("system", "system", "locaton") or uci:get("freifunk", "contact", "location") or ""
+local note = uci:get("freifunk", "contact", "note") or ""
+local lon = uci:get_first("system", "system", "longitude") or ""
+local lat = uci:get_first("system", "system", "latitude") or ""
%>
<h2 name="content"><%:Contact%></h2>
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
index 3134f0b1b9..3affc73fb9 100644
--- a/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
+++ b/modules/luci-mod-freifunk/luasrc/view/freifunk/index.htm
@@ -9,18 +9,10 @@
local uci = require "luci.model.uci".cursor()
local tpl = require "luci.template"
local fs = require "nixio.fs"
-local ff = {}
-local ff = uci:get_all("freifunk")
-if not ff or not ff.community.name then
- community = "Freifunk"
- DefaultText = ""
- nickname = "No Nickname set"
-else
- community = ff.community.name
- DefaultText = ff.community.DefaultText
- nickname = ff.contact.nickname
-end
+local community = uci:get("freifunk", "community", "name") or "Freifunk"
+local DefaultText = uci:get("freifunk", "community", "DefaultText") or ""
+local nickname = uci:get("freifunk", "contact", "nickname") or "No Nickname set"
local co = "profile_" .. community
--local community = uci:get_first(co, "community", "name") or "Freifunk"
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
index acca7cf8a5..145f5807a0 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
@@ -113,7 +113,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null,
var e = document.getElementById(ifc.id + '-ifc-edit');
if (e) e.disabled = true;
- var link = L.url('admin/system/packages') + '?query=luci-proto&display=available';
+ var link = L.url('admin/system/opkg') + '?query=luci-proto';
L.dom.content(d, [
E('em', _('Unsupported protocol type.')), E('br'),
E('a', { href: link }, _('Install protocol extensions...'))
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
index bff859befa..5b230795c3 100644
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/ifaces.lua
@@ -226,8 +226,8 @@ if not net:is_installed() then
function p_install.write()
return luci.http.redirect(
- luci.dispatcher.build_url("admin/system/packages") ..
- "?submit=1&install=%s" % net:opkg_package()
+ luci.dispatcher.build_url("admin/system/opkg") ..
+ "?query=%s" % net:opkg_package()
)
end
end
diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
index 77f0ecf3e2..ab7cac626c 100644
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -23,25 +23,32 @@
font-weight: normal;
font-style: normal;
}
+
strong {
font-weight: normal;
}
+
.table {
display: table;
position: relative;
}
+
.tr {
display: table-row;
}
+
.thead {
display: table-header-group;
}
+
.tbody {
display: table-row-group;
}
+
.tfoot {
display: table-footer-group;
}
+
.td,
.th {
vertical-align: middle;
@@ -49,13 +56,16 @@ strong {
display: table-cell;
padding: .8em;
}
+
.th {
font-weight: normal;
}
+
.tr.placeholder {
height: 4em;
background-color: #f9f9f9;
}
+
.tr.placeholder>.td {
position: absolute;
left: 0;
@@ -65,56 +75,69 @@ strong {
line-height: 3em;
background: #f9f9f9;
}
+
.table[width="33%"],
.th[width="33%"],
.td[width="33%"] {
width: 33%;
}
+
.table[width="100%"],
.th[width="100%"],
.td[width="100%"] {
width: 100%;
}
+
.col-1 {
flex: 1 1 30px !important;
-webkit-flex: 1 1 30px !important;
}
+
.col-2 {
flex: 2 2 60px !important;
-webkit-flex: 2 2 60px !important;
}
+
.col-3 {
flex: 3 3 90px !important;
-webkit-flex: 3 3 90px !important;
}
+
.col-4 {
flex: 4 4 120px !important;
-webkit-flex: 4 4 120px !important;
}
+
.col-5 {
flex: 5 5 150px !important;
-webkit-flex: 5 5 150px !important;
}
+
.col-6 {
flex: 6 6 180px !important;
-webkit-flex: 6 6 180px !important;
}
+
.col-7 {
flex: 7 7 210px !important;
-webkit-flex: 7 7 210px !important;
}
+
.col-8 {
flex: 8 8 240px !important;
-webkit-flex: 8 8 240px !important;
}
+
.col-9 {
flex: 9 9 270px !important;
-webkit-flex: 9 9 270px !important;
}
+
.col-10 {
flex: 10 10 300px !important;
-webkit-flex: 10 10 300px !important;
}
+
.cbi-button-up,
.cbi-button-down,
.cbi-value-helpicon,
@@ -129,26 +152,42 @@ strong {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
+
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
-.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 {
+
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
font-family: inherit;
font-weight: normal;
line-height: 1.1;
color: inherit;
}
+
html {
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
position: relative;
}
+
body {
font-size: 0.8rem;
background-color: #EEE;
}
+
html,
body {
margin: 0px;
@@ -157,6 +196,7 @@ body {
min-height: 100%;
font-family: Microsoft Yahei, WenQuanYi Micro Hei, sans-serif, "Helvetica Neue", Helvetica, Hiragino Sans GB;
}
+
select {
padding: 0.36rem 0.8rem;
color: #555;
@@ -164,6 +204,7 @@ select {
background-image: none;
border: 1px solid #ccc;
}
+
select,
input,
.cbi-dropdown {
@@ -179,30 +220,37 @@ input,
height: auto;
font-size: 0.8rem;
}
+
select:not([multiple="multiple"]):focus,
input:focus {
border-color: #0099CC;
}
+
select[multiple="multiple"] {
height: auto;
}
+
code {
color: #0099CC;
}
+
abbr {
color: #005470;
text-decoration: underline;
cursor: help;
}
+
hr {
margin: 1rem 0;
border-color: #EEE;
opacity: 0.1;
}
+
footer>a {
color: #aaa;
text-decoration: none;
}
+
.main>.loading {
position: fixed;
width: 100%;
@@ -212,6 +260,7 @@ footer>a {
background-color: #354057;
top: 0;
}
+
.main>.loading>span {
display: block;
text-align: center;
@@ -220,27 +269,34 @@ footer>a {
font-size: 1.2rem;
line-height: 45px;
}
+
.main>.loading>span>.loading-img {
margin-right: 0.2rem;
display: inline-block;
}
+
.main>.loading>span>.loading-img img {
vertical-align: middle;
}
+
.pull-right {
float: right;
}
+
.pull-left {
float: left;
}
+
li {
list-style-type: none;
}
+
h1 {
font-size: 2rem;
padding-bottom: 10px;
border-bottom: 1px solid #eee;
}
+
h2 {
margin: 2rem 0 0 0;
color: #354057;
@@ -248,23 +304,28 @@ h2 {
padding-bottom: 10px;
border-bottom: 1px solid #eee;
}
+
h3 {
margin: 2rem 0 0 0;
font-size: 1.4rem;
padding-bottom: 10px;
}
+
h4 {
margin: 2rem 0 0 0;
font-size: 1.2rem;
padding-bottom: 10px;
}
+
.mobile-hide {
display: inline-block;
}
+
.PC-hide {
width: 100%;
display: none;
}
+
.cbi-section {
margin: 1rem 0 0 0;
padding: 2rem;
@@ -278,9 +339,11 @@ h4 {
background-color: #FFF;
-webkit-overflow-scrolling: touch;
}
+
.cbi-section>legend {
display: none !important;
}
+
.cbi-section>h3:first-child,
.panel-title {
width: 100%;
@@ -291,10 +354,12 @@ h4 {
padding-bottom: 1rem;
margin: 0;
}
+
.table {
width: 100%;
border-radius: 20px;
}
+
.table>.tbody>.tr>.td,
.table>.tbody>.tr>.th,
.table>.tfoot>.tr>.td,
@@ -305,65 +370,63 @@ h4 {
border-top: 1px solid #ddd;
white-space: nowrap;
}
+
.cbi-section-table-cell {
white-space: nowrap;
align-self: flex-end;
flex: 1 1 auto;
}
+
.cbi-section-table {
border: none;
}
+
.cbi-section-table-row {
text-align: center;
margin-bottom: 1rem;
background: #f4f4f4;
}
+
.cbi-section-table-row:last-child {
margin-bottom: 0;
}
+
.cbi-section-table-row>.cbi-value-field .cbi-input-select,
.cbi-section-table-row>.cbi-value-field .cbi-input-text,
.cbi-section-table-row>.cbi-value-field .cbi-input-password,
.cbi-section-table-row>.cbi-value-field .cbi-dropdown {
width: 100%;
}
+
.cbi-section-table-row>.cbi-value-field [data-dynlist]>input,
.cbi-section-table-row>.cbi-value-field input.cbi-input-password {
width: calc(100% - 1.5rem);
}
-div>table>tbody>tr:nth-of-type(2n),
-div>.table>.tbody>.tr:nth-of-type(2n) {
- background-color: #f9f9f9;
-}
-div>table>tbody>tr:nth-of-type(2n),
-div>.table>.tbody>.tr:nth-of-type(2n) {
- background-color: #f9f9f9;
-}
-.cbi-section .table .tr.table-titles {
- background-color: #eee;
-}
+
.table .tr:first-child .td:first-child,
.table .tr:first-child::before,
.table .tr:first-child .th:first-child {
border-top-left-radius: 10px;
}
+
.table .tr:first-child .td:last-child,
.table .tr:first-child .th:last-child {
border-top-right-radius: 10px;
}
+
.table .tr:last-child .td:first-child,
.table .tr:last-child::before {
border-bottom-left-radius: 10px;
}
+
.table .tr:last-child .td:last-child {
border-bottom-right-radius: 10px;
}
+
.table .tr.placeholder:last-child {
background-color: transparent;
}
-.cbi-section .table .cbi-section-table-titles {
- background-color: #e0e0e0;
-}
+
/* fix progress bar */
.cbi-progressbar {
background-color: #9bc1cc;
@@ -371,11 +434,13 @@ div>.table>.tbody>.tr:nth-of-type(2n) {
overflow: hidden;
position: relative;
}
+
.cbi-progressbar div {
background-color: #468ea4;
height: 20px;
border-radius: 20px;
}
+
.cbi-progressbar::after {
content: attr(title);
position: absolute;
@@ -387,34 +452,39 @@ div>.table>.tbody>.tr:nth-of-type(2n) {
line-height: 1.2rem;
color: #fff;
}
+
/* fix multiple table */
table table,
.table .table {
border: none;
}
+
.cbi-value-field table,
.cbi-value-field .table {
border: none;
}
+
td>table>tbody>tr>td,
.td>.table>.tbody>.tr>.td {
border: none;
}
+
.cbi-value-field>table>tbody>tr>td,
.cbi-value-field>.table>.tbody>.tr>.td {
border: none;
}
+
/* button style */
.btn,
.cbi-button {
margin: 0 .8rem .5rem 0;
-webkit-appearance: none;
- color: #354057;
- background-color: transparent;
+ color: rgba(0, 0, 0, 0.87);
+ background-color: #F0F0F0;
transition: all 0.2s ease-in-out;
display: inline-block;
padding: .5rem .8rem;
- border: 1px solid;
+ border: none;
border-radius: 25px;
cursor: pointer;
-ms-touch-action: manipulation;
@@ -432,6 +502,7 @@ td>table>tbody>tr>td,
display: inline-block;
text-decoration: none;
}
+
.btn:disabled,
.cbi-button:disabled {
cursor: not-allowed;
@@ -439,6 +510,7 @@ td>table>tbody>tr>td,
opacity: 0.60;
box-shadow: none;
}
+
.cbi-page-actions .cbi-button-apply,
.cbi-section-actions .cbi-button-edit,
.cbi-button-edit.important,
@@ -450,6 +522,7 @@ td>table>tbody>tr>td,
background-color: #337ab7;
border: none;
}
+
.cbi-button-add.important,
.cbi-button-save.important,
.cbi-button-positive.important,
@@ -459,6 +532,7 @@ td>table>tbody>tr>td,
background-color: transparent;
border: 1px solid #337ab7;
}
+
.cbi-button-remove.important,
.cbi-button-reset.important,
.cbi-button-negative.important {
@@ -466,6 +540,7 @@ td>table>tbody>tr>td,
background-color: #d9534f;
border: none;
}
+
.cbi-button-find,
.cbi-button-link,
.cbi-button-up,
@@ -475,6 +550,7 @@ td>table>tbody>tr>td,
background-color: transparent;
border: 1px solid #468ea4;
}
+
.cbi-button-edit,
.cbi-button-reload,
.cbi-button-action {
@@ -482,6 +558,7 @@ td>table>tbody>tr>td,
background-color: transparent;
border: 1px solid #468ea4;
}
+
.cbi-page-actions .cbi-button-apply+.cbi-button-save,
.cbi-button-add,
.cbi-button-save,
@@ -490,6 +567,7 @@ td>table>tbody>tr>td,
background-color: transparent;
border: 1px solid #354057;
}
+
.cbi-section-remove>.cbi-button,
.cbi-button-remove,
.cbi-button-reset,
@@ -498,12 +576,15 @@ td>table>tbody>tr>td,
background-color: transparent;
border: 1px solid #F24C7C;
}
+
.cbi-page-actions .cbi-button-link:first-child {
float: left;
}
+
.a-to-btn {
text-decoration: none;
}
+
/* table */
.container>.tabs,
.container>.tabs>li[class~="active"],
@@ -513,78 +594,91 @@ td>table>tbody>tr>td,
.container>.cbi-tabmenu>li:hover {
border-radius: 20px;
}
+
.container .cbi-map .cbi-tabmenu,
.container .cbi-map .cbi-tabmenu>li[class~="cbi-tab"],
.container .cbi-map .cbi-tabmenu>li:hover {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
+
.container .cbi-map .cbi-tabmenu,
.container>.tabs,
.container>.cbi-tabmenu {
overflow: hidden;
}
+
.container .cbi-map .cbi-tabmenu+div {
border-radius: 0;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
}
+
.tabs {
background-color: #FFFFFF;
margin-top: 1rem;
}
+
.cbi-tabmenu>li,
.tabs>li {
margin-right: .4rem;
display: inline-block;
padding: 0.6rem 0rem;
}
+
.cbi-tabmenu>li>a,
.tabs>li>a {
text-decoration: none;
color: #404040;
padding: 0.5rem 0.8rem;
}
+
.tabs>li[class~="active"],
.tabs>li:hover {
cursor: pointer;
background-color: #337ab7;
}
+
.tabs>li[class~="active"]>a,
.tabs>li:hover>a {
color: #fff;
}
+
.cbi-tabmenu {
border-top: 1px solid #D4D4D4;
border-left: 1px solid #D4D4D4;
border-right: 1px solid #D4D4D4;
}
+
.cbi-tabmenu>li:hover {
background-color: #F1F1F1;
}
+
.cbi-tabmenu>li[class~="cbi-tab"] {
background-color: #fff;
}
+
.cbi-tabmenu {
background-color: #D4D4D4;
}
[data-tab-title] {
- height: 0;
- opacity: 0;
- overflow: hidden;
+ height: 0;
+ opacity: 0;
+ overflow: hidden;
}
[data-tab-active="true"] {
- opacity: 1;
- height: auto;
- overflow: visible;
- transition: opacity .25s ease-in;
+ opacity: 1;
+ height: auto;
+ overflow: visible;
+ transition: opacity .25s ease-in;
}
.cbi-section-remove:nth-of-type(2n) {
background-color: #f9f9f9;
}
+
.cbi-section-node-tabbed {
padding: 0;
margin-top: 0;
@@ -592,20 +686,25 @@ td>table>tbody>tr>td,
border-left: 1px solid #D4D4D4;
border-right: 1px solid #D4D4D4;
}
+
.cbi-tabcontainer>.cbi-value:nth-of-type(2n) {
background-color: #f9f9f9;
}
+
.cbi-value-field,
.cbi-value-description {
display: table-cell;
line-height: 1.25;
}
+
.cbi-value-helpicon>img {
display: none;
}
+
.cbi-value-helpicon:before {
content: "\f059";
}
+
.cbi-value-description {
font-size: small;
opacity: 0.5;
@@ -659,12 +758,19 @@ td>table>tbody>tr>td,
vertical-align: middle;
}
-.cbi-rowstyle-1 {
+.table .tr.cbi-rowstyle-2,
+.table .tr:nth-child(n) {
+ background-color: #eee;
+}
+
+.table .tr.cbi-rowstyle-1,
+.table .tr:nth-child(2n) {
background-color: #f9f9f9;
}
-.cbi-rowstyle-2 {
- background-color: #eee;
+.table .tr.table-titles,
+.table .tr.cbi-section-table-titles {
+ background-color: #ddd;
}
.cbi-section-table .cbi-section-table-titles .cbi-section-table-cell {
@@ -1370,10 +1476,6 @@ header>.container>.pull-right>* {
.node-status-processes .cbi-section {
overflow-x: scroll;
}
-.node-status-iptables #iptables .table-titles,
-.node-system-opkg #packages .cbi-section-table-titles {
- background-color: #eee;
-}
/* fix status realtime traffic and wireless */
@@ -1418,6 +1520,7 @@ header>.container>.pull-right>* {
.node-services-samba.lang_enNetwork #cbi-samba-sambashare .table-container {
overflow-x: scroll;
}
+
.node-services-samba>.main .cbi-tabcontainer:nth-child(3) .cbi-value-title {
margin-bottom: 1rem;
width: auto;
@@ -1645,8 +1748,7 @@ header .logout a {
float: right;
width: calc(100% + 10px);
height: calc(100% - 110px);
- overflow-y: scroll;
- overflow-x: hidden;
+ overflow: hidden;
}
.main>.main-left .nav {
@@ -1784,6 +1886,25 @@ footer {
right: 0;
}
+.modal-overlay-active #modal_overlay {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ width: 100%;
+ background-color: #000000b8;
+ z-index: 2000;
+}
+
+.modal-overlay-active #modal_overlay .modal {
+ width: 50%;
+ background-color: #fff;
+ margin: 150px auto;
+ border-radius: 20px;
+ color: #333;
+}
+
/* The style of the prompt message */
.alert-message {
@@ -1837,20 +1958,25 @@ footer {
min-height: 100%;
background: #fff url(./loginBG.png) no-repeat center center / cover;
}
+
.node-main-login header {
display: none;
}
+
.node-main-login .main {
height: auto;
}
+
.node-main-login>.main>.main-left {
display: none;
}
+
.node-main-login>.main>.main-right {
width: 100%;
height: auto;
min-height: 100%;
}
+
.node-main-login>.main #maincontent {
position: absolute;
min-width: 492px;
@@ -1861,12 +1987,14 @@ footer {
height: auto;
text-align: center;
}
+
.node-main-login>.main .container {
padding: 0;
width: 30%;
max-width: 492px;
display: inline-block;
}
+
.node-main-login>.main .logoImg a {
margin: 0 0 18px 0;
display: block;
@@ -1874,13 +2002,16 @@ footer {
color: #fff;
text-decoration: none;
}
+
.node-main-login>.main .logoImg img:first-child {
width: 72px;
}
+
.node-main-login .warning {
background-color: #3E4A62;
color: #fff;
}
+
.node-main-login>.main form h2 {
margin: 17px 0;
padding: 0;
@@ -1889,32 +2020,38 @@ footer {
font-weight: normal;
border: 0;
}
+
.node-main-login>.main form .cbi-map-descr {
margin: 0 0 12px;
padding: 0;
font-size: 12px;
color: #B1B6BB;
}
+
.node-main-login>.main form .cbi-section {
margin: 0;
padding: 0;
background-color: transparent;
box-shadow: none;
}
+
.node-main-login>.main form .cbi-value {
display: block;
}
+
.node-main-login>.main form .cbi-value-title {
margin: 0;
padding: 0;
display: none;
}
-.node-main-login>.main form .cbi-value-field {
+
+.node-main-login>.main form .cbi-value .cbi-value-field {
margin-bottom: 16px;
display: block;
width: 100%;
position: relative;
}
+
.node-main-login>.main form .cbi-value-field input {
padding-left: 48px;
width: 100%;
@@ -1924,6 +2061,7 @@ footer {
font-size: 20px;
color: #9c9fa1;
}
+
.node-main-login form .cbi-value-field .iconpwd,
.node-main-login form .cbi-value-field .iconuser,
.node-main-login form .cbi-value-field .iconeye {
@@ -1934,28 +2072,35 @@ footer {
left: 16px;
transform: translateY(-50%);
}
+
.node-main-login form .cbi-value-field .iconpwd {
background: transparent url(./pwd.png) no-repeat center center / 100%;
}
+
.node-main-login form .cbi-value-field .iconuser {
background: transparent url(./user.png) no-repeat center center / 100%;
}
+
.node-main-login form .cbi-value-field .iconeye {
left: auto;
right: 16px;
background: transparent url(./op-eye.png) no-repeat center center / 100%;
}
+
.node-main-login form .cbi-value-field .cleye {
background-image: url(./cl-eye.png);
}
+
.node-main-login form .cbi-value-field .opeye {
background-image: url(./op-eye.png);
}
+
.node-main-login form .cbi-page-actions {
padding: 0;
border: 0;
text-align: center;
}
+
.node-main-login form .cbi-page-actions input {
margin: 0 0 0 -4px;
padding: 9px 0;
@@ -1965,38 +2110,47 @@ footer {
width: 50%;
font-size: 18px;
}
+
.node-main-login form .cbi-page-actions .cbi-button-apply {
background-color: #F24C7C;
border-top-left-radius: 50px;
border-bottom-left-radius: 50px;
}
+
.node-main-login form .cbi-page-actions .cbi-button-reset {
background-color: #8a4568;
color: #fff;
border-top-right-radius: 50px;
border-bottom-right-radius: 50px;
}
+
.node-main-login input.cbi-input-text {
box-shadow: 0 0 0 1000px white inset;
}
+
/* Interface after login */
.logged-in {
background-color: #EBF1F6;
}
+
.logged-in header {
height: 70px;
}
+
.logged-in .main {
overflow: hidden;
}
+
.logged-in .main-right {
padding: 0 1rem 3rem 0;
margin-top: 90px;
float: right;
}
+
.logged-in .main .logoImg {
display: none;
}
+
.logged-in .main .main-left .nav-container {
background-color: #354057;
border-radius: 20px;
@@ -2006,6 +2160,7 @@ footer {
right: -10px;
bottom: 10px;
}
+
.logged-in .main .main-left .brand {
margin: 0 auto;
padding: 44px 0 23px;
@@ -2023,11 +2178,13 @@ footer {
-webkit-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
+
.logged-in .alert-message {
padding: 20px 2rem;
border: none;
background-color: #fff;
}
+
.logged-in .alert-message a {
padding: 8px 2rem;
width: auto;
@@ -2035,65 +2192,81 @@ footer {
background-color: #468EA4;
color: #fff;
}
+
@media screen and (max-width: 1600px) {
.main-left {
width: calc(0% + 13rem);
}
+
.btn,
.cbi-button {
padding: 0.3rem 0.6rem;
font-size: 0.8rem;
}
+
header>.container>.pull-right>* {
top: 0.35rem;
}
+
.label {
padding: 0.2rem 0.6rem;
}
+
.cbi-value-title {
width: 15rem;
padding-right: 0.6rem;
}
+
.cbi-input-textarea {
font-size: small;
}
}
+
@media screen and (max-width: 1280px) {
.node-main-login>.main .container {
width: 50%;
}
+
.cbi-tabmenu>li>a,
.tabs>li>a {
padding: 0.2rem 0.5rem;
}
+
.panel-title {
font-size: 1.1rem;
padding-bottom: 1rem;
}
+
table {
font-size: 0.7rem !important;
width: 100% !important;
}
+
.main>.main-left .nav>li,
.main>.main-left .nav>li a,
.main>.main-left .nav>.slide>.menu {
font-size: 0.9rem;
}
+
.main>.main-left .nav>.slide>.slide-menu>li>a {
font-size: 0.7rem;
}
}
+
@media screen and (max-width: 992px) {
.logged-in header {
padding: 0 .8rem;
height: 45px;
}
+
header .brand {
display: none;
}
+
header .btn-con {
line-height: 45px;
}
+
.main-left {
width: auto;
height: auto;
@@ -2108,35 +2281,49 @@ footer {
min-width: 0;
overflow: hidden;
}
+
+ .main>.main-left .navbar-container {
+ overflow-y: scroll;
+ overflow-x: hidden;
+ }
+
.main>.main-left .nav>.slide>.slide-menu>li {
width: 90%;
}
+
header .container {
line-height: 43px;
}
+
.main-right {
width: 100%;
}
+
.node-main-login>.main .container {
width: 60%;
}
+
.showSide {
padding: 0.1rem;
display: inline-block;
vertical-align: middle;
}
+
.cbi-value-title {
width: 9rem;
padding-right: 1rem;
}
+
#diag-rc-output>pre {
font-size: 1rem;
}
+
.tr {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
+
.th,
.td {
flex: 2 2 25%;
@@ -2145,48 +2332,57 @@ footer {
word-wrap: break-word;
display: inline-block;
}
+
.td select,
.td input[type="text"] {
word-wrap: normal;
width: 100%;
}
+
.td [data-dynlist]>input,
.td input.cbi-input-password {
width: calc(100% - 1.5rem);
}
+
.td[data-type="button"],
.td[data-type="fvalue"] {
flex: 1 1 12.5%;
text-align: left;
}
+
.th.cbi-value-field,
.td.cbi-value-field,
.th.cbi-section-table-cell,
.td.cbi-section-table-cell {
flex-basis: auto;
}
+
.cbi-section-table-row {
display: flex;
flex-wrap: wrap;
flex-direction: row;
justify-content: space-between;
}
+
.td.cbi-value-field,
.cbi-section-table-cell {
text-align: center;
display: inline-block;
flex: 10 10 auto;
}
+
.td.cbi-section-actions {
text-align: right;
align-self: flex-end;
vertical-align: bottom;
}
+
.tr.table-titles,
.tr.cbi-section-table-titles,
.tr.cbi-section-table-descr {
display: none;
}
+
.tr[data-title]::before,
.tr.cbi-section-table-titles.named::before {
display: block;
@@ -2195,24 +2391,30 @@ footer {
font-size: .9rem;
border-bottom: 1px solid rgba(0, 0, 0, .26);
}
+
.td[data-title] {
text-align: left;
font-size: 12px;
}
+
.td[data-title]::before {
display: block;
}
+
.hide-sm,
.hide-xs {
display: none;
}
+
/* All styles of the login interface */
.node-main-login .showSide {
display: none !important;
}
+
.logged-in .main {
padding-bottom: .8rem;
}
+
.logged-in .main .main-left .nav-container {
background-color: #354057;
border-radius: 0;
@@ -2222,6 +2424,7 @@ footer {
right: 20%;
bottom: 0;
}
+
.logged-in .main-right {
padding: 0 .8rem;
margin-top: calc(45px + .8rem);
@@ -2229,69 +2432,86 @@ footer {
max-width: unset;
float: unset;
}
+
.logged-in .alert-message {
padding: 8px .8rem;
}
+
.cbi-section {
margin: .8rem 0 0 0;
padding: .8rem;
}
+
small {
font-size: 10px;
line-height: 0;
}
+
.cbi-section>h3:first-child,
.panel-title {
font-size: 1rem;
}
+
.network-status-table .ifacebox-body>span {
font-size: 12px;
}
+
.cbi-section .ifacebox-body .ifacebadge>span {
font-size: 12px;
}
+
.table .tr.cbi-rowstyle-1:nth-child(n),
.table .tr:nth-child(n) {
font-size: 12px;
}
+
.node-network-firewall .table .tr.cbi-rowstyle-1:nth-child(n),
.node-network-firewall .table .tr:nth-child(n) {
border-radius: 20px;
overflow: hidden;
}
+
h2 {
margin: 1rem 0 0 0;
font-size: 1.4rem;
padding-bottom: 0;
border-bottom: none;
}
+
h4 {
font-size: 1rem;
}
+
.cbi-section-node-tabbed {
padding: 0 .5rem;
}
+
.cbi-button,
.cbi-button-action.important {
margin-right: .3rem;
}
+
select {
border-bottom: 1px solid rgba(0, 0, 0, .26);
}
+
.node-status-processes .table .tr.cbi-rowstyle-1:nth-child(n),
.node-status-processes .table .tr:nth-child(n) {
border-radius: 20px;
}
}
+
@media screen and (max-width: 768px) {
.node-main-login {
background: none;
}
+
.node-main-login>.main .logoImg a {
font-size: 30px;
margin: 12px 0 22px 0;
color: #354057;
}
+
.node-main-login>.main #maincontent {
padding-top: 0;
padding-bottom: 1rem;
@@ -2299,49 +2519,61 @@ footer {
top: 0;
transform: translateY(0) translateX(-50%);
}
+
.alert-message {
padding: 8px 15%;
}
+
.alert-message>h4 {
font-size: 14px;
}
+
.alert-message>p,
.alert-message a {
font-size: 12px;
}
+
.a lert-message>h4 {
padding: 8px 0 8px 36px;
}
+
.alert-message a {
padding: 8px 0;
margin-top: 8px;
}
+
.node-main-login .warning {
background-color: #F5F5F6;
color: #354057;
}
+
.alert-message a {
color: #f24c7c;
background: #fff;
}
+
.node-main-login>.main form h2 {
font-size: 16px;
margin: 20px 0 16px;
color: #354057;
}
+
.node-main-login>.main form .cbi-value-field input {
padding-left: 34px;
height: 36px;
background-size: 16px;
font-size: 16px;
}
+
.node-main-login>.main form .cbi-value-field {
margin-bottom: 20px;
}
+
.node-main-login form .cbi-page-actions input {
padding: 6px 0;
font-size: 16px;
}
+
.node-main-login form .cbi-value-field .iconpwd,
.node-main-login form .cbi-value-field .iconuser,
.node-main-login form .cbi-value-field .iconeye {
@@ -2349,21 +2581,26 @@ footer {
width: 16px;
left: 12px;
}
+
.node-main-login form .cbi-value-field .iconeye {
left: auto;
right: 12px;
}
+
.mobile-hide {
display: none;
}
+
.PC-hide {
display: inline-block;
}
}
+
@media screen and (max-width: 480px) {
body {
font-size: 1rem;
}
+
.cbi-value-title {
width: 100%;
min-width: 0rem !important;
@@ -2372,42 +2609,53 @@ footer {
margin-bottom: 0.5rem;
text-align: left;
}
+
.cbi-value-field,
.cbi-value-description {
width: 100%;
}
+
.cbi-value>.cbi-value-field {
display: inline-block;
}
+
.cbi-tabmenu>li,
.tabs>li {
padding: 0.6rem 0rem;
}
+
.cbi-tabmenu>li>a,
.tabs>li>a {
padding: 0.2rem 0.3rem;
font-size: 0.9rem;
}
+
.cbi-page-actions>div>input {
display: none;
}
+
.tabs>li>a {
font-size: 0.9rem;
}
+
select,
input {
font-size: 10px;
}
+
.panel-title {
font-size: 1.4rem;
padding-bottom: 1rem;
}
+
.node-system-packages>.main .cbi-value.cbi-value-last>div {
width: 100% !important;
}
+
.node-system-packages>.main .cbi-value .cbi-value-field input {
width: 100%;
}
+
.node-status-iptables>.main div>.cbi-map>form {
position: static !important;
margin: 0 0 2rem 0;
@@ -2422,66 +2670,83 @@ footer {
border-radius: 20px;
-webkit-overflow-scrolling: touch;
}
+
.node-status-iptables>.main div>.cbi-map>form input[type="submit"] {
width: 100% !important;
margin: 0;
}
+
.node-status-iptables>.main div>.cbi-map>form input[type="submit"]+input[type="submit"] {
margin-top: 1rem;
}
+
.node-main-login>.main .container {
min-width: 90%;
}
+
.th,
.td {
flex-basis: 50%;
}
+
.td.cbi-value-field {
flex-basis: 100%;
}
+
.td.cbi-value-field[data-type="dvalue"] {
flex-basis: 50%;
}
+
.td.cbi-value-field[data-type="button"],
.td.cbi-value-field[data-type="fvalue"] {
flex-basis: 25%;
text-align: left;
}
+
.tr[data-title]::before,
.tr.cbi-section-table-titles.named::before {
font-size: 1rem;
}
+
.hide-xs {
display: none;
}
+
/* All styles of the login interface */
.node-main-login>.main .cbi-value {
padding: 0;
}
+
.alert-message {
padding: 8px 10%;
}
}
+
@media screen and (min-width: 992px) {
.cbi-value-field .cbi-input-select {
width: 20rem;
}
+
.cbi-value-field .cbi-dropdown {
min-width: 20rem;
}
}
+
@media screen and (min-width: 1280px) {
.cbi-value-field .cbi-input-select {
width: 22rem;
}
+
.cbi-value-field .cbi-dropdown {
min-width: 22rem;
}
}
+
@media screen and (min-width: 1600px) {
.cbi-value-field .cbi-input-select {
width: 25rem;
}
+
.cbi-value-field .cbi-dropdown {
min-width: 25rem;
}
diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js
new file mode 100644
index 0000000000..38d82d103e
--- /dev/null
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/ScrollY.js
@@ -0,0 +1 @@
+!function(win,dom){function MyScrollBar(o){this.init(o)}function getStyle(obj,name){return win.getComputedStyle?getComputedStyle(obj,null)[name]:obj.currentStyle[name]}function setStyle(obj,oStyle){for(var i in oStyle)obj.style[i]=oStyle[i]}function getOffsetSize(obj){var sDisplay=getStyle(obj,"display"),res={};if("none"!=sDisplay)res.width=obj.offsetWidth,res.height=obj.offsetHeight;else{var oldStyle={position:getStyle(obj,"position"),visibility:getStyle(obj,"visibility"),display:sDisplay},newStyle;setStyle(obj,{position:"absolute",visibility:"hidden",display:"inline-block"}),res.width=obj.offsetWidth,res.height=obj.offsetHeight,setStyle(obj,oldStyle)}return res}function getClientSize(obj){var iTopW=parseInt(getStyle(obj,"borderTopWidth")),iRightW=parseInt(getStyle(obj,"borderRightWidth")),iBottomW=parseInt(getStyle(obj,"borderBottomWidth")),iLeftW=parseInt(getStyle(obj,"borderLeftWidth")),oOffset=getOffsetSize(obj);return{width:oOffset.width<=0?oOffset.width:oOffset.width-iLeftW-iRightW,height:oOffset.height<=0?oOffset.height:oOffset.height-iTopW-iBottomW}}function canSelectText(bCan){bCan?(dom.body.style.mozUserSelect="text",dom.body.style.webkitUserSelect="text",dom.body.style.msUserSelect="text",dom.body.style.khtmlUserSelect="text",dom.body.style.userSelect="text"):(dom.body.style.mozUserSelect="none",dom.body.style.webkitUserSelect="none",dom.body.style.msUserSelect="none",dom.body.style.khtmlUserSelect="none",dom.body.style.userSelect="none")}function getPosition(obj,goal){var oPos={top:obj.offsetTop,left:obj.offsetLeft};if(obj.parentNode==goal)return oPos;var obj=getPosition(obj.parentNode,goal);oPos.top+=obj.top,oPos.left+=obj.left}MyScrollBar.prototype.init=function(o){this.bYBar=!1,this.iScrollTop=0,this.iScrollLeft=0,this.bYShow=!1,this.oWrapper=dom.getElementById(o.selId),this.oScroll=this.oWrapper.firstElementChild,this.setParam(o),this.addScrollBar(),this.initState(),this.initEvent()},MyScrollBar.prototype.initState=function(){var sWPosition;"static"==getStyle(this.oWrapper,"position")&&setStyle(this.oWrapper,{position:"relative"}),setStyle(this.oScroll,{position:"relative"}),this.bYBar&&(setStyle(this.oYBox,{display:this.enterShow?"none":"block",position:"absolute",top:0,right:0,zIndex:10,width:this.width+"px",height:"100%",backgroundColor:this.bgColor}),setStyle(this.oYBar,{position:"absolute",top:0,left:0,width:"100%",backgroundColor:this.barColor,borderRadius:this.borderRadius+"px",transition:"all "+this.time+"ms"})),this.setSize()},MyScrollBar.prototype.initEvent=function(){var _this=this,sUserAgent;-1!=win.navigator.userAgent.toLowerCase().indexOf("firefox")?this.oWrapper.addEventListener("DOMMouseScroll",function(e){_this.bYBar&&_this.bYShow&&(e.preventDefault(),_this.iScrollTop+=e.detail>0?60:-60,_this.iScrollTop=_this.iScrollTop<=0?0:_this.iScrollTop>=_this.iScrollH-_this.iWrapperH?_this.iScrollH-_this.iWrapperH:_this.iScrollTop,_this.setTransLate(),_this.setYTop(_this.iScrollTop/_this.iScrollH*_this.iYBoxH))}):this.oWrapper.onmousewheel=function(evt){if(_this.bYBar&&_this.bYShow){var e=evt||win.event;evt?e.preventDefault():e.returnValue=!1,_this.iScrollTop+=e.wheelDelta<0?60:-60,_this.iScrollTop=_this.iScrollTop<=0?0:_this.iScrollTop>=_this.iScrollH-_this.iWrapperH?_this.iScrollH-_this.iWrapperH:_this.iScrollTop,_this.setTransLate(),_this.setYTop(_this.iScrollTop/_this.iScrollH*_this.iYBoxH)}};var isInWrapper=!1;this.oWrapper.onmouseenter=function(){isInWrapper=!0,_this.enterShow&&_this.bYBar&&_this.bYShow&&setStyle(_this.oYBox,{display:"block"})},this.oWrapper.onmouseleave=function(){isInWrapper=!1,_this.enterShow&&_this.bYBar&&!bYDown&&_this.bYShow&&setStyle(_this.oYBox,{display:"none"})};var bYDown=!1,bYLeave=!0,iDownPageY=0,iYBarTop=0;this.bYBar&&(this.enterColor&&(this.oYBar.onmouseenter=function(){bYLeave=!1,setStyle(this,{backgroundColor:_this.enterColor})},this.oYBar.onmouseleave=function(){bYLeave=!0,bYDown||setStyle(this,{backgroundColor:_this.barColor})}),this.oYBar.onmousedown=function(e){_this.bYShow&&(bYDown=!0,iDownPageY=e.clientY+dom.documentElement.scrollTop||dom.body.scrollTop,iYBarTop=parseInt(getStyle(this,"top")),_this.setYTime(0),canSelectText(!1))},dom.addEventListener("mouseup",function(){bYDown&&_this.bYShow&&(bYDown=!1,_this.setYTime(_this.time),canSelectText(!0),!isInWrapper&&_this.enterShow&&setStyle(_this.oYBox,{display:"none"})),!bYDown&&bYLeave&&setStyle(_this.oYBar,{backgroundColor:_this.barColor})}),dom.addEventListener("mousemove",function(e){if(bYDown&&_this.bYShow){var iNowPageY=e.clientY+dom.documentElement.scrollTop||dom.body.scrollTop,iNowTop=iYBarTop+iNowPageY-iDownPageY;iNowTop=iNowTop<=0?0:iNowTop>=_this.iYBoxH-_this.iYBarH?_this.iYBoxH-_this.iYBarH:iNowTop,_this.iScrollTop=iNowTop/_this.iYBoxH*_this.iScrollH,_this.setTransLate(),_this.setYTop(iNowTop)}}),this.oYBar.ondrag=function(e){var e=evt||win.event;evt?e.preventDefault():e.returnValue=!1})},MyScrollBar.prototype.setParam=function(o){this.width=o.width?o.width:10,this.bgColor=o.bgColor?o.bgColor:"#eaeaea",this.barColor=o.barColor?o.barColor:"#ccc",this.enterColor=o.enterColor||!1,this.enterShow=!1!==o.enterShow,this.hasY=!1!==o.hasY,this.borderRadius=o.borderRadius>=0?o.borderRadius:this.width/2,this.time=o.time||0},MyScrollBar.prototype.addScrollBar=function(){this.getSize(),this.hasY&&(this.bYBar=!0,this.oYBox=dom.createElement("div"),this.oYBar=dom.createElement("div"),this.oYBox.appendChild(this.oYBar),this.oWrapper.insertBefore(this.oYBox,this.oScroll))},MyScrollBar.prototype.getSize=function(){var oWrapperSize=getClientSize(this.oWrapper),oScrollSize=getClientSize(this.oScroll);this.iWrapperClientH=oWrapperSize.height,this.iPaddingT=parseInt(getStyle(this.oWrapper,"paddingTop")),this.iPaddingR=parseInt(getStyle(this.oWrapper,"paddingRight")),this.iPaddingB=parseInt(getStyle(this.oWrapper,"paddingBottom")),this.iPaddingL=parseInt(getStyle(this.oWrapper,"paddingLeft")),this.iWrapperH=oWrapperSize.height-this.iPaddingT-this.iPaddingB,this.iScrollH=oScrollSize.height,this.bYBar&&(this.iYBoxH=oWrapperSize.height,this.iYBarH=this.iWrapperH/this.iScrollH*this.iYBoxH)},MyScrollBar.prototype.setSize=function(time){var _this=this;time=time||100,setTimeout(function(){_this.getSize(),_this.iScrollTop>=_this.iScrollH-_this.iWrapperH&&(_this.iScrollTop=_this.iScrollH-_this.iWrapperH),_this.bYBar&&(_this.iWrapperH>=_this.iScrollH?(setStyle(_this.oYBox,{display:"none"}),_this.bYShow=!1):(_this.enterShow||setStyle(_this.oYBox,{display:"block"}),setStyle(_this.oYBar,{height:_this.iYBarH+"px",top:_this.iScrollTop/_this.iScrollH*_this.iYBoxH+"px"},0),_this.bYShow=!0))},time)},MyScrollBar.prototype.setTransLate=function(iTime){var sTranslate="translate(-"+this.iScrollLeft+"px, -"+this.iScrollTop+"px)";setStyle(this.oScroll,{transition:"all "+(iTime>=0?iTime:this.time)+"ms",transform:sTranslate,msTransform:sTranslate,mozTransform:sTranslate,webkitTransform:sTranslate,oTransform:sTranslate})},MyScrollBar.prototype.setYTime=function(iTime){setStyle(this.oYBar,{transition:"all "+(iTime>=0?iTime:this.time)+"ms"})},MyScrollBar.prototype.setYTop=function(iTop){setStyle(this.oYBar,{top:iTop+"px"})},MyScrollBar.prototype.jump=function(o){o=o||{};var oPos={top:0,left:0},iTop=0,iBottome=this.iScrollH-this.iWrapperClientH+this.iPaddingT+this.iPaddingB>0?this.iScrollH-this.iWrapperClientH+this.iPaddingT+this.iPaddingB:0,iLeft=0,iRight=this.iScrollW-this.iWrapperClientW+this.iPaddingL+this.iPaddingR>0?this.iScrollW-this.iWrapperClientW+this.iPaddingL+this.iPaddingR:0,obj;if(o.id)oPos=getPosition(document.getElementById(o.id),this.oScroll),this.bYBar&&(oPos.top+=this.iPaddingT);else if(o.pos)if("string"==typeof o.pos)switch(o.pos){case"top":oPos.top=0;break;case"bottom":oPos.top=iBottome;break;case"left":oPos.left=0;break;case"right":oPos.left=iRight}else"object"==typeof o.pos&&(oPos=o.pos);oPos.top=oPos.top>iBottome?iBottome:oPos.top>=0?oPos.top:0,this.iScrollTop=oPos.top,this.setTransLate(o.time),this.bYBar&&(this.setYTime(o.time),this.setYTop(this.iScrollTop/this.iScrollH*this.iYBoxH))},"function"==typeof define&&define.amd&&define([],function(){return MyScrollBar}),win.MyScrollBar=MyScrollBar}(window,document); \ No newline at end of file
diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
index 76ee383ccb..c1a3dcd000 100755
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
@@ -81,6 +81,17 @@
/**
* menu click
*/
+ if ($('.nav').length > 0 && $(window).width() > 992) {
+ var oScroll = new MyScrollBar({
+ selId: 'navBox',
+ time: 100,
+ bgColor: 'transprent',
+ barColor: '#839dd67a',
+ enterColor: '#839dd6cc',
+ enterShow: false
+ });
+ }
+
$(".main > .main-left .nav > .slide > .menu").click(function () {
var ul = $(this).next(".slide-menu");
var menu = $(this);
@@ -94,6 +105,14 @@
ul.removeClass("active");
});
}
+ if ($('.nav').length > 0 && $(window).width() > 992) {
+ oScroll.setSize(200);
+ }
+ setInterval(function(){
+ if($('.nav').height() < $('.navbar-container').height()){
+ $('.nav').css('transform', 'translate(0px, 0px)');
+ }
+ }, 300);
return false;
});
@@ -259,10 +278,10 @@
}else {
$('.node-main-login form .cbi-value-last input[type="text"]').prop('type', 'password');
$('.node-main-login form .cbi-value-field .iconeye').removeClass('cleye').addClass('opeye');
- num = true
+ num = true;
}
- })
+ });
$('body.logged-in').css('min-height', $(window).height());
@@ -271,21 +290,26 @@
$('.logged-in .main-right').outerWidth( $(window).width() - $('.logged-in .main-left').width() - 50 );
}
- $('.cbi-section .table').each(function(){
- var thisTr = $(this).children('.tr').get(0);
- var td = $(thisTr).children('.td').get(0);
- var th = $(thisTr).children('.th').get(0)
- var a = window.getComputedStyle(thisTr, ':before').getPropertyValue('content');
- console.log(td, th);
+ $('.cbi-section .table').each(function () {
+ var firTr = $(this).children('.tr').get(0);
+ var firTd = $(firTr).children('.td').get(0);
+ var th = $(firTr).children('.th').get(0);
- if( th && a != 'none' ){
+ var laTr = $(this).children('.tr').get($(this).children('.tr').length - 1);
+ var laTd = $(laTr).children('.td').get(0);
+ var a = window.getComputedStyle(firTr, ':before').getPropertyValue('content');
+
+ if (th && a != 'none') {
$(th).css('border-top-left-radius', '0');
- }else if( td && a != 'none' ){
- $(td).css('border-top-left-radius', '0');
+ } else if (firTd && a != 'none') {
+ $(firTd).css('border-top-left-radius', '0');
+ }
+ if (laTd && a != 'none') {
+ $(laTd).css('border-bottom-left-radius', '0');
}
});
});
- $('.lang_enNetwork #cbi-samba-sambashare .table').wrap('<div class="table-container"></div>');
+ $('#iptables').prev().css('margin-top', '10px');
})(jQuery);
diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm
index f0cbe4e968..4377e1ca98 100755
--- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm
+++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm
@@ -43,8 +43,8 @@
<script>
var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>;
</script>
-<script src="<%=media%>/js/jquery.min.js?v=git-18.247.71242-9541751"></script>
-<script src="<%=media%>/js/script.js?v=git-18.247.71242-9541751"></script>
+<script src="<%=media%>/js/jquery.min.js"></script>
+<script src="<%=media%>/js/script.js"></script>
</body>
</html>
diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm
index 21fa78e3c6..a6aafbed61 100644
--- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm
+++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm
@@ -123,7 +123,7 @@
local function render_topmenu()
local childs = disp.node_childs(cattree)
if #childs > 0 then
- write('<ul class="nav">')
+ write('<ul class="nav scroll">')
for i, r in ipairs(childs) do
local nnode = cattree.nodes[r]
@@ -231,6 +231,7 @@
<% end -%>
<script src="<%=resource%>/cbi.js"></script>
<script src="<%=resource%>/xhr.js"></script>
+ <script src="<%=media%>/js/ScrollY.js"></script>
</head>
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
@@ -264,7 +265,7 @@
<div class="nav-container">
<a class="brand" href="#">
<%=boardinfo.hostname or "?"%></a>
- <div class="navbar-container">
+ <div class="navbar-container" id="navBox">
<% render_topmenu() %>
</div>
</div>