summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua5
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/query.htm4
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/runtime.htm130
-rw-r--r--applications/luci-app-adblock/po/it/adblock.po123
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po121
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po97
-rw-r--r--applications/luci-app-adblock/po/ru/adblock.po223
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po103
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot74
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po200
-rw-r--r--applications/luci-app-adblock/po/zh-tw/adblock.po216
-rw-r--r--applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po149
-rw-r--r--applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po150
-rw-r--r--applications/luci-app-ahcp/po/zh-cn/ahcp.po50
-rw-r--r--applications/luci-app-ahcp/po/zh-tw/ahcp.po70
-rw-r--r--applications/luci-app-aria2/po/zh-cn/aria2.po8
-rw-r--r--applications/luci-app-aria2/po/zh-tw/aria2.po8
-rw-r--r--applications/luci-app-clamav/po/zh-tw/clamav.po131
-rw-r--r--applications/luci-app-commands/po/zh-cn/commands.po25
-rw-r--r--applications/luci-app-commands/po/zh-tw/commands.po67
-rw-r--r--applications/luci-app-coovachilli/po/zh-cn/coovachilli.po14
-rw-r--r--applications/luci-app-coovachilli/po/zh-tw/coovachilli.po17
-rw-r--r--applications/luci-app-ddns/Makefile3
-rwxr-xr-xapplications/luci-app-ddns/luasrc/tools/ddns.lua69
-rw-r--r--applications/luci-app-ddns/po/ru/ddns.po58
-rw-r--r--applications/luci-app-ddns/po/zh-cn/ddns.po10
-rw-r--r--applications/luci-app-ddns/po/zh-tw/ddns.po18
-rw-r--r--applications/luci-app-diag-core/po/zh-cn/diag_core.po15
-rw-r--r--applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po255
-rw-r--r--applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po255
-rw-r--r--applications/luci-app-dynapoint/po/zh-cn/dynapoint.po105
-rw-r--r--applications/luci-app-dynapoint/po/zh-tw/dynapoint.po105
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm6
-rw-r--r--applications/luci-app-firewall/po/ru/firewall.po130
-rw-r--r--applications/luci-app-firewall/po/zh-cn/firewall.po30
-rw-r--r--applications/luci-app-firewall/po/zh-tw/firewall.po104
-rw-r--r--applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po26
-rw-r--r--applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po35
-rw-r--r--applications/luci-app-fwknopd/po/zh-cn/fwknopd.po100
-rw-r--r--applications/luci-app-fwknopd/po/zh-tw/fwknopd.po100
-rw-r--r--applications/luci-app-https_dns_proxy/Makefile17
-rw-r--r--applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua7
-rw-r--r--applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua53
-rw-r--r--applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot32
-rw-r--r--applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy10
-rw-r--r--applications/luci-app-meshwizard/po/zh-cn/meshwizard.po63
-rw-r--r--applications/luci-app-meshwizard/po/zh-tw/meshwizard.po79
-rw-r--r--applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua36
-rw-r--r--applications/luci-app-minidlna/po/ca/minidlna.po56
-rw-r--r--applications/luci-app-minidlna/po/cs/minidlna.po68
-rw-r--r--applications/luci-app-minidlna/po/de/minidlna.po74
-rw-r--r--applications/luci-app-minidlna/po/el/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/en/minidlna.po74
-rw-r--r--applications/luci-app-minidlna/po/es/minidlna.po74
-rw-r--r--applications/luci-app-minidlna/po/fr/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/he/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/hu/minidlna.po74
-rw-r--r--applications/luci-app-minidlna/po/it/minidlna.po76
-rw-r--r--applications/luci-app-minidlna/po/ja/minidlna.po76
-rw-r--r--applications/luci-app-minidlna/po/ms/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/no/minidlna.po74
-rw-r--r--applications/luci-app-minidlna/po/pl/minidlna.po74
-rw-r--r--applications/luci-app-minidlna/po/pt-br/minidlna.po70
-rw-r--r--applications/luci-app-minidlna/po/pt/minidlna.po64
-rw-r--r--applications/luci-app-minidlna/po/ro/minidlna.po54
-rw-r--r--applications/luci-app-minidlna/po/ru/minidlna.po48
-rw-r--r--applications/luci-app-minidlna/po/sk/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/sv/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/templates/minidlna.pot40
-rw-r--r--applications/luci-app-minidlna/po/tr/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/uk/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/vi/minidlna.po40
-rw-r--r--applications/luci-app-minidlna/po/zh-cn/minidlna.po113
-rw-r--r--applications/luci-app-minidlna/po/zh-tw/minidlna.po144
-rw-r--r--applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po50
-rw-r--r--applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po169
-rw-r--r--applications/luci-app-mwan3/luasrc/controller/mwan3.lua23
-rw-r--r--applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua6
-rw-r--r--applications/luci-app-mwan3/po/ja/mwan3.po21
-rw-r--r--applications/luci-app-mwan3/po/ru/mwan3.po21
-rw-r--r--applications/luci-app-mwan3/po/templates/mwan3.pot21
-rw-r--r--applications/luci-app-mwan3/po/zh-cn/mwan3.po47
-rw-r--r--applications/luci-app-mwan3/po/zh-tw/mwan3.po122
-rw-r--r--applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po56
-rw-r--r--applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po376
-rw-r--r--applications/luci-app-noddos/po/zh-cn/noddos.po105
-rw-r--r--applications/luci-app-noddos/po/zh-tw/noddos.po105
-rw-r--r--applications/luci-app-ntpc/po/zh-cn/ntpc.po15
-rw-r--r--applications/luci-app-ntpc/po/zh-tw/ntpc.po15
-rw-r--r--applications/luci-app-nut/Makefile16
-rw-r--r--applications/luci-app-nut/luasrc/controller/nut.lua25
-rw-r--r--applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua44
-rw-r--r--applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua241
-rw-r--r--applications/luci-app-nut/luasrc/model/cbi/nut_server.lua191
-rwxr-xr-xapplications/luci-app-nut/root/etc/uci-defaults/40_luci-nut22
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua34
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua3
-rw-r--r--applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua23
-rw-r--r--applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm8
-rw-r--r--applications/luci-app-openvpn/po/zh-tw/openvpn.po26
-rw-r--r--applications/luci-app-openvpn/root/etc/config/openvpn_recipes139
-rw-r--r--applications/luci-app-p910nd/po/zh-cn/p910nd.po19
-rw-r--r--applications/luci-app-p910nd/po/zh-tw/p910nd.po31
-rw-r--r--applications/luci-app-pagekitec/po/zh-cn/pagekitec.po56
-rw-r--r--applications/luci-app-pagekitec/po/zh-tw/pagekitec.po56
-rw-r--r--applications/luci-app-radicale/Makefile4
-rw-r--r--applications/luci-app-samba4/luasrc/model/cbi/samba4.lua60
-rw-r--r--applications/luci-app-samba4/po/ca/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/cs/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/de/samba4.po34
-rw-r--r--applications/luci-app-samba4/po/el/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/en/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/es/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/fr/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/he/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/hu/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/it/samba4.po24
-rw-r--r--applications/luci-app-samba4/po/ja/samba4.po33
-rw-r--r--applications/luci-app-samba4/po/ms/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/no/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/pl/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/pt-br/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/pt/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/ro/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/ru/samba4.po24
-rw-r--r--applications/luci-app-samba4/po/sk/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/sv/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/templates/samba4.pot19
-rw-r--r--applications/luci-app-samba4/po/tr/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/uk/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/vi/samba4.po19
-rw-r--r--applications/luci-app-samba4/po/zh-cn/samba4.po40
-rw-r--r--applications/luci-app-samba4/po/zh-tw/samba4.po40
-rw-r--r--applications/luci-app-shairplay/po/zh-cn/shairplay.po50
-rw-r--r--applications/luci-app-shairplay/po/zh-tw/shairplay.po50
-rw-r--r--applications/luci-app-simple-adblock/po/templates/simple-adblock.pot3
-rw-r--r--applications/luci-app-statistics/po/zh-tw/statistics.po12
-rw-r--r--applications/luci-app-transmission/po/ca/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/cs/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/de/transmission.po7
-rw-r--r--applications/luci-app-transmission/po/el/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/en/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/es/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/fr/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/he/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/hu/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/it/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/ja/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/ms/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/no/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/pl/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/pt-br/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/pt/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/ro/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/ru/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/sk/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/sv/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/templates/transmission.pot3
-rw-r--r--applications/luci-app-transmission/po/tr/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/uk/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/vi/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/zh-cn/transmission.po3
-rw-r--r--applications/luci-app-transmission/po/zh-tw/transmission.po3
-rw-r--r--applications/luci-app-travelmate/luasrc/controller/travelmate.lua2
-rw-r--r--applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua3
-rw-r--r--applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm9
-rw-r--r--applications/luci-app-travelmate/po/ja/travelmate.po85
-rw-r--r--applications/luci-app-travelmate/po/pt-br/travelmate.po40
-rw-r--r--applications/luci-app-travelmate/po/ru/travelmate.po80
-rw-r--r--applications/luci-app-travelmate/po/templates/travelmate.pot40
-rw-r--r--applications/luci-app-unbound/luasrc/controller/unbound.lua17
-rw-r--r--applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua132
-rw-r--r--applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua2
-rw-r--r--applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua95
-rw-r--r--applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua73
-rw-r--r--applications/luci-app-upnp/po/zh-cn/upnp.po25
-rw-r--r--applications/luci-app-upnp/po/zh-tw/upnp.po25
-rw-r--r--applications/luci-app-vnstat/po/zh-cn/vnstat.po29
-rw-r--r--applications/luci-app-vnstat/po/zh-tw/vnstat.po25
-rw-r--r--applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po6
-rw-r--r--applications/luci-app-watchcat/po/zh-cn/watchcat.po37
-rw-r--r--applications/luci-app-watchcat/po/zh-tw/watchcat.po38
-rw-r--r--applications/luci-app-wifischedule/po/zh-tw/wifischedule.po101
-rw-r--r--applications/luci-app-wireguard/po/zh-cn/wireguard.po13
-rw-r--r--applications/luci-app-wireguard/po/zh-tw/wireguard.po76
-rw-r--r--applications/luci-app-wol/po/zh-cn/wol.po7
-rw-r--r--applications/luci-app-wol/po/zh-tw/wol.po9
-rw-r--r--modules/luci-base/luasrc/model/uci.lua38
-rw-r--r--modules/luci-base/luasrc/sys.lua18
-rw-r--r--modules/luci-base/luasrc/view/cbi/apply_widget.htm2
-rw-r--r--modules/luci-base/luasrc/view/cbi/value.htm2
-rw-r--r--modules/luci-base/po/ca/base.po39
-rw-r--r--modules/luci-base/po/cs/base.po39
-rw-r--r--modules/luci-base/po/de/base.po39
-rw-r--r--modules/luci-base/po/el/base.po39
-rw-r--r--modules/luci-base/po/en/base.po36
-rw-r--r--modules/luci-base/po/es/base.po39
-rw-r--r--modules/luci-base/po/fr/base.po39
-rw-r--r--modules/luci-base/po/he/base.po36
-rw-r--r--modules/luci-base/po/hu/base.po39
-rw-r--r--modules/luci-base/po/it/base.po39
-rw-r--r--modules/luci-base/po/ja/base.po116
-rw-r--r--modules/luci-base/po/ko/base.po31
-rw-r--r--modules/luci-base/po/ms/base.po31
-rw-r--r--modules/luci-base/po/no/base.po39
-rw-r--r--modules/luci-base/po/pl/base.po156
-rw-r--r--modules/luci-base/po/pt-br/base.po39
-rw-r--r--modules/luci-base/po/pt/base.po39
-rw-r--r--modules/luci-base/po/ro/base.po39
-rw-r--r--modules/luci-base/po/ru/base.po78
-rw-r--r--modules/luci-base/po/sk/base.po31
-rw-r--r--modules/luci-base/po/sv/base.po39
-rw-r--r--modules/luci-base/po/templates/base.pot31
-rw-r--r--modules/luci-base/po/tr/base.po192
-rw-r--r--modules/luci-base/po/uk/base.po44
-rw-r--r--modules/luci-base/po/vi/base.po31
-rw-r--r--modules/luci-base/po/zh-cn/base.po140
-rw-r--r--modules/luci-base/po/zh-tw/base.po39
-rw-r--r--modules/luci-mod-admin-full/luasrc/controller/admin/system.lua32
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua2
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm8
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm48
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm59
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm14
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm89
-rw-r--r--protocols/luci-proto-ipv6/Makefile2
-rw-r--r--protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua15
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua2
-rw-r--r--protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua2
-rw-r--r--themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css71
-rw-r--r--themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm7
-rw-r--r--themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css4
-rw-r--r--[-rwxr-xr-x]themes/luci-theme-material/htdocs/luci-static/material/cascade.css (renamed from themes/luci-theme-material/htdocs/luci-static/material/css/style.css)48
-rw-r--r--themes/luci-theme-material/htdocs/luci-static/material/custom.css9
-rw-r--r--themes/luci-theme-material/luasrc/view/themes/material/header.htm30
-rw-r--r--themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css61
-rw-r--r--themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm7
241 files changed, 8192 insertions, 3095 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 3bf7392914..2ecaaab726 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -3,7 +3,6 @@
local fs = require("nixio.fs")
local uci = require("luci.model.uci").cursor()
-local sys = require("luci.sys")
local util = require("luci.util")
local dump = util.ubus("network.interface", "dump", {})
@@ -13,10 +12,6 @@ m = Map("adblock", translate("Adblock"),
.. "<a href=\"%s\" target=\"_blank\">"
.. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))
-function m.on_apply(self)
- luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
-end
-
-- Main adblock options
s = m:section(NamedSection, "global", "adblock")
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
index 2cf7e5baaf..88108c3f21 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
@@ -11,7 +11,7 @@ This is free software, licensed under the Apache License, Version 2.0
function update_status(data)
{
- var domain = data.value;
+ var domain = data.value || data.placeholder;
var input = document.getElementById('query_input');
var output = document.getElementById('query_output');
@@ -48,7 +48,7 @@ This is free software, licensed under the Apache License, Version 2.0
<div class="cbi-section">
<div class="cbi-section-descr"><%:This form allows you to query active block lists for certain domains, e.g. for whitelisting.%></div>
<div style="width:33%; float:left;">
- <input type="text" value="google.com" name="input" />
+ <input type="text" placeholder="google.com" name="input" />
<input type="button" value="<%:Query%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.input)" />
</div>
<br style="clear:both" />
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
index 05cdde73b9..4f7cfbf8a1 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
@@ -6,7 +6,7 @@ This is free software, licensed under the Apache License, Version 2.0
<style type="text/css">
.runtime
{
- color: #0069d6;
+ color: #37c;
font-weight: bold;
display: inline-block;
width: 100%;
@@ -18,58 +18,50 @@ This is free software, licensed under the Apache License, Version 2.0
//<![CDATA[
function status_update(json)
{
- var view = document.getElementById("value_1");
- var btn1 = document.getElementById("btn1");
- var btn2 = document.getElementById("btn2");
- var input = json.data.adblock_status;
+ var btn1 = document.getElementById("btn1");
+ var btn1_running = document.getElementById("btn1_running");
+ var btn2 = document.getElementById("btn2");
+ var btn2_running = document.getElementById("btn2_running");
+ var input = json.data.adblock_status || "-";
- view.innerHTML = input || "-";
- if (input === "enabled")
- {
- btn1.value = "<%:Suspend%>";
- btn1.name = "do_suspend";
- btn2.value = "<%:Refresh%>";
- btn2.name = "do_refresh";
- btn1.disabled = false;
- running(btn1_running, 0);
- btn2.disabled = false;
- running(btn2_running, 0);
- }
- else if (input === "paused")
- {
- btn1.value = "<%:Resume%>";
- btn1.name = "do_resume";
- btn2.value = "<%:Refresh%>";
- btn2.name = "do_refresh";
- btn1.disabled = false;
- running(btn1_running, 0);
- btn2.disabled = false;
- running(btn2_running, 0);
- }
- else
- {
- btn1.value = "<%:Suspend%>";
- btn1.name = "do_suspend";
- btn2.value = "<%:Refresh%>";
- btn2.name = "do_refresh";
- btn1.disabled = true;
- btn2.disabled = true;
- }
- view = document.getElementById("value_2");
- input = json.data.adblock_version;
- view.innerHTML = input || "-";
- view = document.getElementById("value_3");
- input = json.data.fetch_utility;
- view.innerHTML = input || "-";
- view = document.getElementById("value_4");
- input = json.data.dns_backend;
- view.innerHTML = input || "-";
- view = document.getElementById("value_5");
- input = json.data.overall_domains;
- view.innerHTML = input || "-";
- view = document.getElementById("value_6");
- input = json.data.last_rundate;
- view.innerHTML = input || "-";
+ document.getElementById("value_1").innerHTML = input;
+ if (input === "enabled")
+ {
+ btn1.value = "<%:Suspend%>";
+ btn1.name = "do_suspend";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = false;
+ running(btn1_running, 0);
+ btn2.disabled = false;
+ running(btn2_running, 0);
+ }
+ else if (input === "paused")
+ {
+ btn1.value = "<%:Resume%>";
+ btn1.name = "do_resume";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = false;
+ running(btn1_running, 0);
+ btn2.disabled = false;
+ running(btn2_running, 0);
+ }
+ else
+ {
+ btn1.value = "<%:Suspend%>";
+ btn1.name = "do_suspend";
+ btn2.value = "<%:Refresh%>";
+ btn2.name = "do_refresh";
+ btn1.disabled = true;
+ btn2.disabled = true;
+ }
+
+ document.getElementById("value_2").innerHTML = json.data.adblock_version || "-";
+ document.getElementById("value_3").innerHTML = json.data.fetch_utility || "-";
+ document.getElementById("value_4").innerHTML = json.data.dns_backend || "-";
+ document.getElementById("value_5").innerHTML = json.data.overall_domains || "-";
+ document.getElementById("value_6").innerHTML = json.data.last_rundate || "-";
}
function btn_action(action)
@@ -114,32 +106,42 @@ This is free software, licensed under the Apache License, Version 2.0
}
}
+ function reset_view()
+ {
+ document.getElementById("btn1").value = "<%:Suspend%>";
+ document.getElementById("btn1").name = "do_suspend";
+ document.getElementById("btn2").value = "<%:Refresh%>";
+ document.getElementById("btn2").name = "do_refresh";
+ document.getElementById("btn1").disabled = true;
+ document.getElementById("btn2").disabled = true;
+ document.getElementById("value_1").innerHTML = "-";
+ document.getElementById("value_2").innerHTML = "-";
+ document.getElementById("value_3").innerHTML = "-";
+ document.getElementById("value_4").innerHTML = "-";
+ document.getElementById("value_5").innerHTML = "-";
+ document.getElementById("value_6").innerHTML = "-";
+ }
+
XHR.get('<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null,
function(x, json_info)
{
- if (!x || !json_info)
+ if (!x || !json_info || !json_info.data)
{
- var btn1 = document.getElementById("btn1");
- var btn2 = document.getElementById("btn2");
- btn1.value = "<%:Suspend%>";
- btn1.name = "do_suspend";
- btn2.value = "<%:Refresh%>";
- btn2.name = "do_refresh";
- btn1.disabled = true;
- btn2.disabled = false;
+ reset_view();
return;
}
- status_update(json_info)
+ status_update(json_info);
});
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "services", "adblock", "status")%>', null,
function(x, json_info)
{
- if (!x || !json_info)
+ if (!x || !json_info || !json_info.data)
{
+ reset_view();
return;
}
- status_update(json_info)
+ status_update(json_info);
});
//]]>
</script>
diff --git a/applications/luci-app-adblock/po/it/adblock.po b/applications/luci-app-adblock/po/it/adblock.po
index 9eddb7d91b..14c64bcaea 100644
--- a/applications/luci-app-adblock/po/it/adblock.po
+++ b/applications/luci-app-adblock/po/it/adblock.po
@@ -14,9 +14,6 @@ msgstr ""
msgid "'Jail' Blocklist Creation"
msgstr ""
-msgid "-------"
-msgstr ""
-
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!"
@@ -25,9 +22,6 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-msgid "Adblock Logfile"
-msgstr "Registro Adblock"
-
msgid "Adblock Status"
msgstr "Status Adblock"
@@ -57,7 +51,7 @@ msgstr ""
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
msgid ""
@@ -146,11 +140,6 @@ msgid "Flush DNS Cache after adblock processing."
msgstr ""
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
@@ -177,15 +166,12 @@ msgstr "Ultimo Avvio"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
+"List of supported DNS backends with their default list export directory."
msgstr ""
-"Lista dei backend DNS supportati con la loro directory di default di esporto "
-"della lista.<br />"
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
@@ -193,10 +179,10 @@ msgstr ""
msgid "Loading"
msgstr "Caricando"
-msgid "Max. Download Queue"
+msgid "Low Priority Service"
msgstr ""
-msgid "Name"
+msgid "Max. Download Queue"
msgstr ""
msgid "No"
@@ -237,12 +223,19 @@ msgstr "Interrogazione domini"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
+msgstr ""
+
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
+msgstr ""
+
+msgid "Refresh"
msgstr ""
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+msgid "Refresh Blocklist Sources"
msgstr ""
-"Reindirizza tutte le richieste DNS dalla zona 'lan' al risolvitore locale."
msgid "Resume"
msgstr "Riprendi"
@@ -258,12 +251,17 @@ msgstr "Salva"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
msgid "Startup Trigger"
@@ -286,19 +284,19 @@ msgstr "Directory per la lista di blocco generata 'adb_list.overall'."
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
msgstr ""
-"Questo form ti consente di modificare il contenuto della lista nera di "
-"adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
msgstr ""
-"Questo form ti consente di modificare il contenuto della lista bianca di "
-"adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -315,13 +313,6 @@ msgstr ""
"determinati domini, p.e. per metterli nella lista bianca."
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr ""
-"Questo form mostra l'output del registro, prefiltrato per messaggi relativi "
-"solo ad adblock."
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
@@ -351,28 +342,60 @@ msgid ""
"kidsafe configurations."
msgstr ""
-msgid "disabled"
-msgstr "disabilitato"
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
-msgid "enabled"
-msgstr "abilitato"
+#~ msgid "Adblock Logfile"
+#~ msgstr "Registro Adblock"
-msgid "error"
-msgstr "errore"
+#~ msgid ""
+#~ "List of supported DNS backends with their default list export directory."
+#~ "<br />"
+#~ msgstr ""
+#~ "Lista dei backend DNS supportati con la loro directory di default di "
+#~ "esporto della lista.<br />"
-msgid "n/a"
-msgstr "n/d"
+#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+#~ msgstr ""
+#~ "Reindirizza tutte le richieste DNS dalla zona 'lan' al risolvitore locale."
-msgid "paused"
-msgstr "in pausa"
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock blacklist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Questo form ti consente di modificare il contenuto della lista nera di "
+#~ "adblock (%s).<br />"
-msgid "running"
-msgstr ""
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock whitelist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Questo form ti consente di modificare il contenuto della lista bianca di "
+#~ "adblock (%s).<br />"
+
+#~ msgid ""
+#~ "This form shows the syslog output, pre-filtered for adblock related "
+#~ "messages only."
+#~ msgstr ""
+#~ "Questo form mostra l'output del registro, prefiltrato per messaggi "
+#~ "relativi solo ad adblock."
+
+#~ msgid "disabled"
+#~ msgstr "disabilitato"
+
+#~ msgid "enabled"
+#~ msgstr "abilitato"
+
+#~ msgid "error"
+#~ msgstr "errore"
+
+#~ msgid "n/a"
+#~ msgstr "n/d"
+
+#~ msgid "paused"
+#~ msgstr "in pausa"
#~ msgid "Invalid domain specified!"
#~ msgstr "Dominio invalido specificato!"
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index ff3234175a..888ecd945e 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -8,15 +8,12 @@ msgstr ""
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.7\n"
+"X-Generator: Poedit 2.1.1\n"
"Language: ja\n"
msgid "'Jail' Blocklist Creation"
msgstr "'Jail' ブロックリストã®ä½œæˆ"
-msgid "-------"
-msgstr "(利用ä¸å¯ï¼‰"
-
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,9 +24,6 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-msgid "Adblock Logfile"
-msgstr "Adblock ログファイル"
-
msgid "Adblock Status"
msgstr "Adblock ステータス"
@@ -43,7 +37,7 @@ msgid "Advanced"
msgstr "詳細設定"
msgid "Archive Categories"
-msgstr ""
+msgstr "アーカイブ カテゴリ"
msgid "Backup Directory"
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—å…ˆ ディレクトリ"
@@ -55,14 +49,14 @@ msgid "Blocklist Sources"
msgstr "ブロックリストæ供元"
msgid "Blocklist not found!"
-msgstr ""
+msgstr "ブロックリストãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ï¼"
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
-"ホワイトリストã«å­˜åœ¨ã—ãªã„全ドメインã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’ブロックã™ã‚‹ãŸã‚ã«ã€è¿½åŠ ã§ "
-"'Jail' リスト (/tmp/adb_list.jail) を作æˆã—ã¾ã™ã€‚<br />"
+"ホワイトリストã«åˆ—挙ã•ã‚ŒãŸã‚‚ã®ã‚’除ãå…¨ã¦ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’ブロックã™ã‚‹ã€è¿½åŠ ã® "
+"'Jail' リスト (/tmp/adb_list.jail) を作æˆã—ã¾ã™ã€‚"
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
@@ -156,13 +150,6 @@ msgid "Flush DNS Cache after adblock processing."
msgstr "Adblock 処ç†ã®å¾Œã« DNS キャッシュをクリアã—ã¾ã™ã€‚"
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-"SSLã§ä¿è­·ã•ã‚Œã¦ã„るブロックリストã®å–å¾—ã«ã¯ã€é©åˆ‡ãªSSL ライブラリãŒå¿…è¦ã§ã™ã€‚"
-"例: 'libustream-ssl' ã¾ãŸã¯ 'built-in'"
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
@@ -193,17 +180,16 @@ msgstr "最終実行"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
-"利用å¯èƒ½ãªãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェースã®ä¸€è¦§ã§ã™ã€‚通常〠'wan' インター"
-"フェースã«ã‚ˆã‚Šã‚¹ã‚¿ãƒ¼ãƒˆã‚¢ãƒƒãƒ—ãŒãƒˆãƒªã‚¬ã•ã‚Œã¾ã™ã€‚<br />"
+"利用å¯èƒ½ãªãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェースã®ä¸€è¦§ã§ã™ã€‚通常ã€ã‚¹ã‚¿ãƒ¼ãƒˆã‚¢ãƒƒãƒ—㯠"
+"'wan' インターフェースã«ã‚ˆã£ã¦ãƒˆãƒªã‚¬ã•ã‚Œã¾ã™ã€‚"
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
+"List of supported DNS backends with their default list export directory."
msgstr ""
-"サãƒãƒ¼ãƒˆã•ã‚Œã‚‹ DNS ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã¨ã€ãã‚Œãžã‚Œã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒªã‚¹ãƒˆå‡ºåŠ›å…ˆãƒ‡ã‚£ãƒ¬ã‚¯"
-"トリã®ãƒªã‚¹ãƒˆã§ã™<br />"
+"サãƒãƒ¼ãƒˆã•ã‚Œã‚‹ DNS ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ã¨ã€ãã‚Œãžã‚Œã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒªã‚¹ãƒˆå‡ºåŠ›å…ˆã®ä¸€è¦§ã§"
+"ã™ã€‚"
msgid "List of supported and fully pre-configured download utilities."
msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã€ã‹ã¤è¨­å®šæ¸ˆã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ ユーティリティã®ä¸€è¦§ã§ã™ã€‚"
@@ -211,12 +197,12 @@ msgstr "サãƒãƒ¼ãƒˆã•ã‚Œã€ã‹ã¤è¨­å®šæ¸ˆã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ ユーティãƒ
msgid "Loading"
msgstr "読込中"
+msgid "Low Priority Service"
+msgstr "低優先度サービス"
+
msgid "Max. Download Queue"
msgstr "ダウンロード キューã®ä¸Šé™"
-msgid "Name"
-msgstr ""
-
msgid "No"
msgstr "ã„ã„ãˆ"
@@ -254,14 +240,23 @@ msgstr "ドメインã®æ¤œç´¢"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
msgstr ""
-"メール通知を行ã†ãƒ‰ãƒ¡ã‚¤ãƒ³ カウントã®ä¸‹é™ã‚’設定ã—ã¾ã™ã€‚全体カウントãŒæŒ‡å®šã•ã‚ŒãŸ"
-"値以下ã®å ´åˆã€ãƒ¡ãƒ¼ãƒ«ã‚’å—ã‘å–ã‚Šã¾ã™ï¼ˆè¦å®šå€¤: 0)。<br />"
+"メール通知を行ã†ãƒ¡ãƒ¼ãƒ«é€šçŸ¥ã‚«ã‚¦ãƒ³ãƒˆã®ä¸‹é™å€¤ã‚’設定ã—ã¾ã™ã€‚全体カウントãŒæŒ‡å®šã•"
+"ã‚ŒãŸå€¤ä»¥ä¸‹ã®å ´åˆã€ãƒ¡ãƒ¼ãƒ«ã‚’å—ã‘å–ã‚Šã¾ã™ï¼ˆè¦å®šå€¤: 0)。"
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"'lan' ゾーンã‹ã‚‰ã®å…¨ DNS クエリをã€ãƒ­ãƒ¼ã‚«ãƒ« リゾルãƒã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚"
+"'lan' ゾーンã‹ã‚‰ã®å…¨ DNS クエリをローカル リゾルãƒã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚ã“ã‚Œ"
+"ã¯ã€53, 853, 5353 ã®å„ãƒãƒ¼ãƒˆã«ãŠã‘ã‚‹ UDP, TCP プロトコルã«é©ç”¨ã•ã‚Œã¾ã™ã€‚"
+
+msgid "Refresh"
+msgstr "リフレッシュ"
+
+msgid "Refresh Blocklist Sources"
+msgstr "ブロックリストæ供元ã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥"
msgid "Resume"
msgstr "å†é–‹"
@@ -277,16 +272,23 @@ msgstr "ä¿å­˜"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+"処ç†ã‚¨ãƒ©ãƒ¼ã¾ãŸã¯ãƒ‰ãƒ¡ã‚¤ãƒ³ カウント㌠0 以下ã®å ´åˆã€é€šçŸ¥ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã™ã€‚"
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
-"処ç†ã‚¨ãƒ©ãƒ¼ã¾ãŸã¯ãƒ‰ãƒ¡ã‚¤ãƒ³ カウントãŒ0以下ã®å ´åˆã€ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã™ã€‚<br />"
+"nice値(優先度)を '低優先度' ã«è¨­å®šã—ã€adblock ãƒãƒƒã‚¯ã‚°ãƒ©ã‚¦ãƒ³ãƒ‰å‡¦ç†ã®ã‚·ã‚¹ãƒ†"
+"ムリソース使用é‡ã‚’抑制ã—ã¾ã™ã€‚"
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
"ダウンロードã®åˆ¶å¾¡ã¨ãƒªã‚¹ãƒˆã®å‡¦ç†ã‚’åŒæ™‚並行的ã«è¡Œã†ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ キューã®ã‚µã‚¤ã‚º"
-"ã§ã™ï¼ˆæ—¢å®šå€¤: '4')。<br />"
+"ã§ã™ï¼ˆè¦å®šå€¤: '4')。"
msgid "Startup Trigger"
msgstr "スタートアップ トリガ"
@@ -312,19 +314,23 @@ msgstr ""
"LuCI上ã§ã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç·¨é›†ã‚’è¡Œã†ã«ã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã™ãŽã¾ã™ (&ge; 100 "
"KB)。"
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr "Adblock ã«é–¢é€£ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã¿ãŒæŠ½å‡ºã•ã‚ŒãŸã€ã‚·ã‚¹ãƒ†ãƒ ãƒ­ã‚°å‡ºåŠ›ã§ã™ã€‚"
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr "ã“ã®å¤‰æ›´ã®å映ã«ã¯ã€æ‰‹å‹•ã§ã®ã‚µãƒ¼ãƒ“スã®åœæ­¢ / å†èµ·å‹•ãŒå¿…è¦ã§ã™ã€‚"
+
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
msgstr ""
"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã§ã¯ã€Adblock ブラックリスト (%s) ã®å†…容を変更ã™ã‚‹ã“ã¨ãŒã§ãã¾"
-"ã™ã€‚<br />"
+"ã™ã€‚"
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
msgstr ""
"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã§ã¯ã€Adblock ホワイトリスト (%s) ã®å†…容を変更ã™ã‚‹ã“ã¨ãŒã§ãã¾"
-"ã™ã€‚<br />"
+"ã™ã€‚"
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -341,13 +347,6 @@ msgstr ""
"ã™ã€‚例: ホワイトリスト内"
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr ""
-"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã«ã¯ã€ã‚·ã‚¹ãƒ†ãƒ ãƒ­ã‚°å†…ã® Adblock ã«é–¢é€£ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã¿ãŒè¡¨ç¤ºã•ã‚Œ"
-"ã¾ã™ã€‚"
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
@@ -379,32 +378,8 @@ msgstr ""
"ã“ã®åˆ¶ç´„ã®åŽ³ã—ã„ブロックリストをã€ã‚²ã‚¹ãƒˆ WiFi ã‚„å­ä¾›ã®å®‰å…¨ã‚’守る設定ãªã©ã«æ‰‹"
"å‹•ã§åˆ©ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-msgid "disabled"
-msgstr "無効"
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
"例: Adblock ã®ã‚¢ãƒƒãƒ—デート毎ã«ãƒ¡ãƒ¼ãƒ«ã‚’å—ã‘å–ã‚‹ã«ã¯ã€150000 ã«è¨­å®šã—ã¾ã™ã€‚"
-
-msgid "enabled"
-msgstr "有効"
-
-msgid "error"
-msgstr "エラー"
-
-msgid "n/a"
-msgstr "利用ä¸å¯"
-
-msgid "paused"
-msgstr "一時åœæ­¢"
-
-msgid "running"
-msgstr "実行中"
-
-#~ msgid "Categories"
-#~ msgstr "カテゴリー"
-
-#~ msgid "Invalid domain specified!"
-#~ msgstr "無効ãªãƒ‰ãƒ¡ã‚¤ãƒ³ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã™ï¼"
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 6e5c7497c7..2cd4dcfaca 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -15,9 +15,6 @@ msgstr ""
msgid "'Jail' Blocklist Creation"
msgstr ""
-msgid "-------"
-msgstr ""
-
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!"
@@ -26,9 +23,6 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-msgid "Adblock Logfile"
-msgstr "Arquivo de log do Adblock"
-
msgid "Adblock Status"
msgstr ""
@@ -60,7 +54,7 @@ msgstr ""
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
msgid ""
@@ -146,11 +140,6 @@ msgid "Flush DNS Cache after adblock processing."
msgstr ""
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
@@ -177,12 +166,11 @@ msgstr ""
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
+"List of supported DNS backends with their default list export directory."
msgstr ""
msgid "List of supported and fully pre-configured download utilities."
@@ -191,10 +179,10 @@ msgstr ""
msgid "Loading"
msgstr "Carregando"
-msgid "Max. Download Queue"
+msgid "Low Priority Service"
msgstr ""
-msgid "Name"
+msgid "Max. Download Queue"
msgstr ""
msgid "No"
@@ -232,10 +220,18 @@ msgstr "Consulta de domínios"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
+msgstr ""
+
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+msgid "Refresh"
+msgstr ""
+
+msgid "Refresh Blocklist Sources"
msgstr ""
msgid "Resume"
@@ -252,12 +248,17 @@ msgstr "Salvar"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
msgid "Startup Trigger"
@@ -280,19 +281,19 @@ msgstr ""
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
msgstr ""
-"Esse formulário permite que você modifique o conteúdo das listas de bloqueio "
-"do adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
msgstr ""
-"Esse formulário permite que você modifique o conteúdo das listas de "
-"permissão do adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -309,13 +310,6 @@ msgstr ""
"certos domínios, e.x. para listas de permissão."
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr ""
-"Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do "
-"adblock apenas."
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
@@ -343,28 +337,37 @@ msgid ""
"kidsafe configurations."
msgstr ""
-msgid "disabled"
-msgstr ""
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
-msgid "enabled"
-msgstr ""
+#~ msgid "Adblock Logfile"
+#~ msgstr "Arquivo de log do Adblock"
-msgid "error"
-msgstr ""
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock blacklist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Esse formulário permite que você modifique o conteúdo das listas de "
+#~ "bloqueio do adblock (%s).<br />"
-msgid "n/a"
-msgstr "n/d"
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock whitelist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Esse formulário permite que você modifique o conteúdo das listas de "
+#~ "permissão do adblock (%s).<br />"
-msgid "paused"
-msgstr ""
+#~ msgid ""
+#~ "This form shows the syslog output, pre-filtered for adblock related "
+#~ "messages only."
+#~ msgstr ""
+#~ "Esse formulário mostra a saída do syslog, pré-filtrado para mensagens do "
+#~ "adblock apenas."
-msgid "running"
-msgstr ""
+#~ msgid "n/a"
+#~ msgstr "n/d"
#~ msgid "Invalid domain specified!"
#~ msgstr "Domínio especificado inválido!"
diff --git a/applications/luci-app-adblock/po/ru/adblock.po b/applications/luci-app-adblock/po/ru/adblock.po
index f4957994b6..166681463b 100644
--- a/applications/luci-app-adblock/po/ru/adblock.po
+++ b/applications/luci-app-adblock/po/ru/adblock.po
@@ -18,22 +18,16 @@ msgstr ""
msgid "'Jail' Blocklist Creation"
msgstr "Создание Черного<br />ÑпиÑка 'Jail'"
-msgid "-------"
-msgstr "-------"
-
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!"
msgstr ""
-"<b>Внимание:</b> Ð”Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐžÐ—Ð£, на уÑтройÑтвах"
-"Ñ ÐžÐ—Ð£ менее 64MB, выбирайте только необходимый минимум ÑпиÑков!"
+"<b>Внимание:</b> Ð”Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐžÐ—Ð£, на уÑтройÑÑ‚Ð²Ð°Ñ…Ñ ÐžÐ—Ð£ "
+"менее 64MB, выбирайте только необходимый минимум ÑпиÑков!"
msgid "Adblock"
msgstr "AdBlock"
-msgid "Adblock Logfile"
-msgstr "СиÑтемный журнал Adblock"
-
msgid "Adblock Status"
msgstr "СоÑтоÑние Adblock"
@@ -63,11 +57,8 @@ msgstr "СпиÑок блокировок не найден!"
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
-"Создать дополнительный Черный ÑпиÑок 'Jail' (/tmp/adb_list.jail), чтобы "
-"заблокировать доÑтуп ко вÑем доменам, кроме тех что перечиÑлены в файле "
-"Белого ÑпиÑка.<br />"
msgid ""
"Choose 'none' to disable automatic startups, 'timed' to use a classic "
@@ -90,8 +81,8 @@ msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
msgstr ""
-"Создание Ñжатых резервных копий ÑпиÑков блокировок, они будут "
-"иÑпользоватьÑÑ Ð² Ñлучае ошибок загрузки или при запуÑке в ручном режиме."
+"Создание Ñжатых резервных копий ÑпиÑков блокировок, они будут иÑпользоватьÑÑ "
+"в Ñлучае ошибок загрузки или при запуÑке в ручном режиме."
msgid "DNS Backend (DNS Directory)"
msgstr "DNS бÑкенд (папка DNS)"
@@ -140,8 +131,9 @@ msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
-"Включить полную Ñортировку / удаление дубликатов в памÑти. ИÑпользуйте на уÑтройÑтвах Ñ "
-"низким объемом памÑти (&lt; 64 MB Ñвободной оперативной памÑти)."
+"Включить полную Ñортировку / удаление дубликатов в памÑти. ИÑпользуйте на "
+"уÑтройÑтвах Ñ Ð½Ð¸Ð·ÐºÐ¸Ð¼ объемом памÑти (&lt; 64 MB Ñвободной оперативной "
+"памÑти)."
msgid "Enable verbose debug logging in case of any processing error."
msgstr "Включить подробное ведение журнала отладки в Ñлучае ошибок обработки."
@@ -159,13 +151,6 @@ msgid "Flush DNS Cache after adblock processing."
msgstr "ОчиÑтка DNS-кÑша поÑле обработки Adblock-ом."
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-"Ð”Ð»Ñ SSL-защищенных иÑточников ÑпиÑков блокировки, вам нужны подходÑщие SSL "
-"библиотеки, например 'libustream-ssl' или 'built-in'."
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
@@ -176,8 +161,8 @@ msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
msgstr ""
-"Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñти вы можете увеличить Ñто значение, например "
-"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ '8' или '16' должны быть безопаÑными."
+"Ð”Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ Ð¿Ð¾Ð²Ñ‹ÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ñти вы можете увеличить Ñто "
+"значение, например Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ '8' или '16' должны быть безопаÑными."
msgid "Force Local DNS"
msgstr "Локальный DNS"
@@ -196,30 +181,27 @@ msgstr "ПоÑледний запуÑк"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
-"СпиÑок доÑтупных Ñетевых интерфейÑов. По умолчанию уÑтановлен 'wan' "
-"интерфейÑ.<br />"
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
+"List of supported DNS backends with their default list export directory."
msgstr ""
-"СпиÑок поддерживаемых Ñерверов DNS Ñ Ð¸Ñ… Ñтандартными папками Ð´Ð»Ñ ÑкÑпорта ÑпиÑков.<br />"
msgid "List of supported and fully pre-configured download utilities."
msgstr ""
-"СпиÑок поддерживаемых и полноÑтью предварительно наÑтроенных утилит Ð´Ð»Ñ ÑкачиваниÑ."
+"СпиÑок поддерживаемых и полноÑтью предварительно наÑтроенных утилит Ð´Ð»Ñ "
+"ÑкачиваниÑ."
msgid "Loading"
msgstr "Загрузка"
+msgid "Low Priority Service"
+msgstr ""
+
msgid "Max. Download Queue"
msgstr "МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾Ñ‡ÐµÑ€ÐµÐ´ÑŒ загрузки"
-msgid "Name"
-msgstr ""
-
msgid "No"
msgstr "Ðет"
@@ -257,14 +239,19 @@ msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
+msgstr ""
+
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-"Увеличьте количеÑтво email уведомлений, чтобы получить ÑообщениÑ, еÑли "
-"общее количеÑтво меньше или равно заданному пределу (по умолчанию 0),<br />"
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+msgid "Refresh"
+msgstr ""
+
+msgid "Refresh Blocklist Sources"
msgstr ""
-"ПеренаправлÑÑ‚ÑŒ вÑе DNS запроÑÑ‹ Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа 'lan' на обработку Adblock-ом."
msgid "Resume"
msgstr "Возобновить"
@@ -280,17 +267,18 @@ msgstr "Сохранить"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
-"ОтправлÑÑ‚ÑŒ email ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñлучае ошибки обработки или еÑли количеÑтво обработанных доменов равно"
-" 0.<br />"
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
-"КоличеÑтво потоков Ð´Ð»Ñ ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÑпиÑков блокировок (по умолчанию "
-"'4').<br />"
msgid "Startup Trigger"
msgstr "Триггер запуÑка"
@@ -305,26 +293,30 @@ msgid ""
"Target directory for adblock backups. Please use only non-volatile disks, e."
"g. an external usb stick."
msgstr ""
-"Папка Ð´Ð»Ñ Ð±Ñкапов ÑпиÑков блокировок. ИÑпользуйте такие "
-"накопители, как usb флешка."
+"Папка Ð´Ð»Ñ Ð±Ñкапов ÑпиÑков блокировок. ИÑпользуйте такие накопители, как usb "
+"флешка."
msgid "Target directory for the generated blocklist 'adb_list.overall'."
msgstr "Папка Ð´Ð»Ñ Ñозданного ÑпиÑка блокировки 'adb_list.overall'."
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
-msgstr "Этот файл Ñлишком большой Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² Web-интерфейÑе LuCI (&ge; 100 KB)."
+msgstr ""
+"Этот файл Ñлишком большой Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² Web-интерфейÑе LuCI (&ge; 100 "
+"KB)."
+
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr ""
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
msgstr ""
-"Данное поле позволÑет изменÑÑ‚ÑŒ Ñодержимое Черного ÑпиÑка Adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
msgstr ""
-"Данное поле позволÑет изменÑÑ‚ÑŒ Ñодержимое Белого ÑпиÑка Adblock (%s).<br />"
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -341,11 +333,6 @@ msgstr ""
"Белого ÑпиÑка."
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr "Страница ÑиÑтемного журнала. Только ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑвÑзанные Ñ Adblock."
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
@@ -377,27 +364,107 @@ msgstr ""
"Ð’Ñ‹ можете вручную наÑтраивать и иÑпользовать Ñтот Черный ÑпиÑок, например "
"Ð´Ð»Ñ Ð³Ð¾Ñтевой wifi Ñети или режима родительÑкого контролÑ."
-msgid "disabled"
-msgstr "отключено"
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
-"например, чтобы получать email ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ каждом "
-"обновлении Adblock-а уÑтановите значение 150000."
-
-msgid "enabled"
-msgstr "включено"
-
-msgid "error"
-msgstr "ошибка"
-
-msgid "n/a"
-msgstr "нет данных"
-
-msgid "paused"
-msgstr "приоÑтановлено"
-
-msgid "running"
-msgstr "работает"
+"например, чтобы получать email ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ каждом обновлении Adblock-а "
+"уÑтановите значение 150000."
+
+#~ msgid "-------"
+#~ msgstr "-------"
+
+#~ msgid "Adblock Logfile"
+#~ msgstr "СиÑтемный журнал Adblock"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file.<br />"
+#~ msgstr ""
+#~ "Создать дополнительный Черный ÑпиÑок 'Jail' (/tmp/adb_list.jail), чтобы "
+#~ "заблокировать доÑтуп ко вÑем доменам, кроме тех что перечиÑлены в файле "
+#~ "Белого ÑпиÑка.<br />"
+
+#~ msgid ""
+#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. "
+#~ "'libustream-ssl' or 'built-in'."
+#~ msgstr ""
+#~ "Ð”Ð»Ñ SSL-защищенных иÑточников ÑпиÑков блокировки, вам нужны подходÑщие "
+#~ "SSL библиотеки, например 'libustream-ssl' или 'built-in'."
+
+#~ msgid ""
+#~ "List of available network interfaces. Usually the startup will be "
+#~ "triggered by the 'wan' interface.<br />"
+#~ msgstr ""
+#~ "СпиÑок доÑтупных Ñетевых интерфейÑов. По умолчанию уÑтановлен 'wan' "
+#~ "интерфейÑ.<br />"
+
+#~ msgid ""
+#~ "List of supported DNS backends with their default list export directory."
+#~ "<br />"
+#~ msgstr ""
+#~ "СпиÑок поддерживаемых Ñерверов DNS Ñ Ð¸Ñ… Ñтандартными папками Ð´Ð»Ñ ÑкÑпорта "
+#~ "ÑпиÑков.<br />"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),<br />"
+#~ msgstr ""
+#~ "Увеличьте количеÑтво email уведомлений, чтобы получить ÑообщениÑ, еÑли "
+#~ "общее количеÑтво меньше или равно заданному пределу (по умолчанию 0),<br /"
+#~ ">"
+
+#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+#~ msgstr ""
+#~ "ПеренаправлÑÑ‚ÑŒ вÑе DNS запроÑÑ‹ Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñа 'lan' на обработку Adblock-ом."
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0.<br />"
+#~ msgstr ""
+#~ "ОтправлÑÑ‚ÑŒ email ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñлучае ошибки обработки или еÑли "
+#~ "количеÑтво обработанных доменов равно 0.<br />"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '4').<br />"
+#~ msgstr ""
+#~ "КоличеÑтво потоков Ð´Ð»Ñ ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ñ ÑпиÑков блокировок (по умолчанию '4')."
+#~ "<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock blacklist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Данное поле позволÑет изменÑÑ‚ÑŒ Ñодержимое Черного ÑпиÑка Adblock (%s)."
+#~ "<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock whitelist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Данное поле позволÑет изменÑÑ‚ÑŒ Ñодержимое Белого ÑпиÑка Adblock (%s).<br /"
+#~ ">"
+
+#~ msgid ""
+#~ "This form shows the syslog output, pre-filtered for adblock related "
+#~ "messages only."
+#~ msgstr "Страница ÑиÑтемного журнала. Только ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÑвÑзанные Ñ Adblock."
+
+#~ msgid "disabled"
+#~ msgstr "отключено"
+
+#~ msgid "enabled"
+#~ msgstr "включено"
+
+#~ msgid "error"
+#~ msgstr "ошибка"
+
+#~ msgid "n/a"
+#~ msgstr "нет данных"
+
+#~ msgid "paused"
+#~ msgstr "приоÑтановлено"
+
+#~ msgid "running"
+#~ msgstr "работает"
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 3fb7bbe2e0..5b101c3a96 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -4,9 +4,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8\n"
msgid "'Jail' Blocklist Creation"
msgstr ""
-msgid "-------"
-msgstr "-------"
-
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!"
@@ -15,9 +12,6 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-msgid "Adblock Logfile"
-msgstr "Adblock's loggfil"
-
msgid "Adblock Status"
msgstr "Status för Adblock"
@@ -47,7 +41,7 @@ msgstr ""
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
msgid ""
@@ -136,11 +130,6 @@ msgid "Flush DNS Cache after adblock processing."
msgstr ""
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
@@ -168,12 +157,11 @@ msgstr "Kördes senast"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
+"List of supported DNS backends with their default list export directory."
msgstr ""
msgid "List of supported and fully pre-configured download utilities."
@@ -182,10 +170,10 @@ msgstr ""
msgid "Loading"
msgstr "Laddar"
-msgid "Max. Download Queue"
+msgid "Low Priority Service"
msgstr ""
-msgid "Name"
+msgid "Max. Download Queue"
msgstr ""
msgid "No"
@@ -221,10 +209,18 @@ msgstr "Fråga efter domäner"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
msgstr ""
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
+msgstr ""
+
+msgid "Refresh"
+msgstr ""
+
+msgid "Refresh Blocklist Sources"
msgstr ""
msgid "Resume"
@@ -241,12 +237,17 @@ msgstr "Spara"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
msgid "Startup Trigger"
@@ -269,19 +270,19 @@ msgstr ""
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
msgstr ""
-"Det här formuläret tillåter dig att förändra innehållet i adblock's "
-"svartlista (%s).<br />"
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
msgstr ""
-"Det här formuläret tillåter dig att förändra innehållet i adblock's vitlista "
-"(%s).<br />"
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -296,11 +297,6 @@ msgid ""
msgstr ""
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr ""
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
@@ -328,28 +324,45 @@ msgid ""
"kidsafe configurations."
msgstr ""
-msgid "disabled"
-msgstr "inaktiverad"
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
-msgid "enabled"
-msgstr "aktiverad"
+#~ msgid "-------"
+#~ msgstr "-------"
+
+#~ msgid "Adblock Logfile"
+#~ msgstr "Adblock's loggfil"
-msgid "error"
-msgstr "fel"
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock blacklist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Det här formuläret tillåter dig att förändra innehållet i adblock's "
+#~ "svartlista (%s).<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock whitelist (%s)."
+#~ "<br />"
+#~ msgstr ""
+#~ "Det här formuläret tillåter dig att förändra innehållet i adblock's "
+#~ "vitlista (%s).<br />"
-msgid "n/a"
-msgstr "n/a"
+#~ msgid "disabled"
+#~ msgstr "inaktiverad"
-msgid "paused"
-msgstr "pausad"
+#~ msgid "enabled"
+#~ msgstr "aktiverad"
-msgid "running"
-msgstr ""
+#~ msgid "error"
+#~ msgstr "fel"
+
+#~ msgid "n/a"
+#~ msgstr "n/a"
+
+#~ msgid "paused"
+#~ msgstr "pausad"
#~ msgid "Invalid domain specified!"
#~ msgstr "Ogiltig domän angiven!"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index e4c2a71418..117ce1faff 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -4,9 +4,6 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "'Jail' Blocklist Creation"
msgstr ""
-msgid "-------"
-msgstr ""
-
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!"
@@ -15,9 +12,6 @@ msgstr ""
msgid "Adblock"
msgstr ""
-msgid "Adblock Logfile"
-msgstr ""
-
msgid "Adblock Status"
msgstr ""
@@ -47,7 +41,7 @@ msgstr ""
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
msgid ""
@@ -129,11 +123,6 @@ msgid "Flush DNS Cache after adblock processing."
msgstr ""
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
msgstr ""
@@ -160,12 +149,11 @@ msgstr ""
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
+"List of supported DNS backends with their default list export directory."
msgstr ""
msgid "List of supported and fully pre-configured download utilities."
@@ -174,10 +162,10 @@ msgstr ""
msgid "Loading"
msgstr ""
-msgid "Max. Download Queue"
+msgid "Low Priority Service"
msgstr ""
-msgid "Name"
+msgid "Max. Download Queue"
msgstr ""
msgid "No"
@@ -213,10 +201,18 @@ msgstr ""
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
msgstr ""
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
+msgstr ""
+
+msgid "Refresh"
+msgstr ""
+
+msgid "Refresh Blocklist Sources"
msgstr ""
msgid "Resume"
@@ -233,12 +229,17 @@ msgstr ""
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
msgid "Startup Trigger"
@@ -261,14 +262,18 @@ msgstr ""
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr ""
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
msgstr ""
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
msgstr ""
msgid ""
@@ -282,11 +287,6 @@ msgid ""
msgstr ""
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr ""
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr ""
@@ -314,25 +314,7 @@ msgid ""
"kidsafe configurations."
msgstr ""
-msgid "disabled"
-msgstr ""
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
msgstr ""
-
-msgid "enabled"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
-msgid "n/a"
-msgstr ""
-
-msgid "paused"
-msgstr ""
-
-msgid "running"
-msgstr ""
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index f7d1833c83..0b0d2d2fe4 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -1,11 +1,11 @@
# liushuyu <liushuyu_011@163.com>, 2017.
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2017-10-28 16:06+0800\n"
+"PO-Revision-Date: 2018-08-07 20:41+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -16,10 +16,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
msgid "'Jail' Blocklist Creation"
-msgstr "“Jail†拦截åå•åˆ›å»º"
-
-msgid "-------"
-msgstr "-------"
+msgstr "“Jailâ€æ‹¦æˆªåˆ—表创建"
msgid ""
"<b>Caution:</b> To prevent OOM exceptions on low memory devices with less "
@@ -31,9 +28,6 @@ msgstr ""
msgid "Adblock"
msgstr "Adblock"
-msgid "Adblock Logfile"
-msgstr "Adblock 日志文件"
-
msgid "Adblock Status"
msgstr "Adblock 状æ€"
@@ -41,13 +35,13 @@ msgid "Adblock Version"
msgstr "Adblock 版本"
msgid "Additional trigger delay in seconds before adblock processing begins."
-msgstr "è§¦å‘ Adblock 开始处ç†å‰çš„é¢å¤–延迟(以秒为å•ä½ï¼‰ã€‚"
+msgstr "è§¦å‘ Adblock 开始处ç†å‰çš„é¢å¤–延迟(秒)。"
msgid "Advanced"
msgstr "高级"
msgid "Archive Categories"
-msgstr ""
+msgstr "存档类别"
msgid "Backup Directory"
msgstr "备份目录"
@@ -59,11 +53,11 @@ msgid "Blocklist Sources"
msgstr "拦截列表æ¥æº"
msgid "Blocklist not found!"
-msgstr ""
+msgstr "拦截列表未找到ï¼"
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
msgid ""
@@ -129,7 +123,7 @@ msgstr "å¯ç”¨ Blocklist 备份"
msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
-msgstr "在低内存设备上å¯ç”¨ç§¯æžçš„内存整体排åº/é‡å¤ç§»é™¤(&lt; 64 MB 空闲内存)"
+msgstr "在低内存设备上å¯ç”¨ç§¯æžçš„内存整体排åº/é‡å¤ç§»é™¤ï¼ˆ&lt; 64 MB 空闲内存)"
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出现任何处ç†é”™è¯¯çš„情况下å¯ç”¨è¯¦ç»†è°ƒè¯•æ—¥å¿—记录。"
@@ -147,16 +141,9 @@ msgid "Flush DNS Cache after adblock processing."
msgstr "在 adblock 进程å¯åŠ¨åŽæ¸…空 DNS 缓存。"
msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
-"å¯¹å— SSL ä¿æŠ¤çš„拦截列表æºï¼Œæ‚¨éœ€è¦ä¸€ä¸ªåˆé€‚çš„ SSL 库,如 “libustream-ssl†或 "
-"“built-inâ€ã€‚"
-
-msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
-msgstr "进一步信æ¯<a href=\"%s\" target=\"_blank\">请访问在线文档"
+msgstr "进一步信æ¯<a href=\"%s\" target=\"_blank\">请访问在线文档</a>"
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
@@ -180,13 +167,12 @@ msgstr "最åŽè¿è¡Œ"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
-msgstr "å¯ç”¨ç½‘络接å£åˆ—表。通常å¯åŠ¨å°†ç”± “wan†接å£è§¦å‘。<br />"
+"by the 'wan' interface."
+msgstr ""
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
-msgstr "支æŒçš„ DNS åŽç«¯åˆ—表åŠå…¶é»˜è®¤åˆ—表导出目录。<br />"
+"List of supported DNS backends with their default list export directory."
+msgstr ""
msgid "List of supported and fully pre-configured download utilities."
msgstr "支æŒå’Œå®Œå…¨é¢„é…置的下载工具列表。"
@@ -194,12 +180,12 @@ msgstr "支æŒå’Œå®Œå…¨é¢„é…置的下载工具列表。"
msgid "Loading"
msgstr "加载中"
+msgid "Low Priority Service"
+msgstr ""
+
msgid "Max. Download Queue"
msgstr "最大下载队列"
-msgid "Name"
-msgstr ""
-
msgid "No"
msgstr "å¦"
@@ -217,15 +203,15 @@ msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
"allowed - ip addresses, wildcards and regex are not."
msgstr ""
-"请æ¯è¡Œåªæ·»åŠ ä¸€ä¸ªåŸŸã€‚å…许使用'#'开头的注释 - ip 地å€ã€é€šé…符和正则表达å¼éƒ½ä¸"
-"å…许。"
+"请æ¯è¡Œåªæ·»åŠ ä¸€ä¸ªåŸŸã€‚å…许使用“#â€å¼€å¤´çš„注释 - ip 地å€ã€é€šé…符和正则表达å¼éƒ½ä¸å…"
+"许。"
msgid "Please edit this file directly in a terminal session."
msgstr "请在终端会è¯ä¸­ç›´æŽ¥ç¼–辑此文件。"
msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr "请注æ„:这需è¦é¢å¤–çš„ “msmtp†软件包安装和设置。"
+msgstr "请注æ„:这需è¦é¢å¤–的“msmtpâ€è½¯ä»¶åŒ…安装和设置。"
msgid "Query"
msgstr "查询"
@@ -235,13 +221,19 @@ msgstr "查询域"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
+msgstr ""
+
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
+msgstr ""
+
+msgid "Refresh"
msgstr ""
-"如果总数å°äºŽæˆ–等于给定é™åˆ¶ï¼ˆé»˜è®¤ä¸º 0),请æ高最å°ç”µå­é‚®ä»¶é€šçŸ¥æ•°ï¼Œä»¥èŽ·å–电å­"
-"邮件。"
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
-msgstr "将所有 DNS 查询从“lanâ€åŒºåŸŸé‡å®šå‘到本地解æžå™¨ã€‚"
+msgid "Refresh Blocklist Sources"
+msgstr ""
msgid "Resume"
msgstr "æ¢å¤"
@@ -257,13 +249,18 @@ msgstr "ä¿å­˜"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
-msgstr "如果å‘生错误或域计数 &le; 0,å‘é€é€šçŸ¥ç”µå­é‚®ä»¶ã€‚<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
+msgstr ""
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
-msgstr "处ç†ä¸‹è½½é˜Ÿåˆ—çš„å¤§å° ï¼†amp; 并行处ç†åˆ—表(默认 “4â€ï¼‰ã€‚<br />"
+"parallel (default '4')."
+msgstr ""
msgid "Startup Trigger"
msgstr "å¯åŠ¨è§¦å‘器"
@@ -277,23 +274,27 @@ msgstr "æš‚åœ/æ¢å¤ Adblock"
msgid ""
"Target directory for adblock backups. Please use only non-volatile disks, e."
"g. an external usb stick."
-msgstr "adblock 备份的目标目录。 请仅使用éžæ˜“失性ç£ç›˜ï¼Œä¾‹å¦‚:一个外置 U 盘。"
+msgstr "adblock 备份的目标目录。请仅使用éžæ˜“失性ç£ç›˜ï¼Œä¾‹å¦‚:一个外置 U 盘。"
msgid "Target directory for the generated blocklist 'adb_list.overall'."
-msgstr "生æˆçš„ blocklist 'adb_list.overall'的目标目录。"
+msgstr "生æˆæ‹¦æˆªåˆ—表“adb_list.overallâ€çš„目标目录。"
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
msgstr "文件过大,无法使用 LuCI 的在线编辑(&ge; 100 KB)。"
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
-msgstr "此表å•å…许您修改 adblock 黑åå•ï¼ˆ%s)的内容。<br />"
+msgstr ""
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
-msgstr "此表å•å…许您修改 adblock 白åå•ï¼ˆ%s)的内容。<br />"
+msgstr ""
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -306,11 +307,6 @@ msgid ""
msgstr "此表å•å…许您查询æŸäº›åŸŸçš„活动å—列表,例如用于列出白åå•ã€‚"
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr "此表å•æ˜¾ç¤ºç³»ç»Ÿæ—¥å¿—输出,仅针对 adblock 相关的消æ¯è¿›è¡Œäº†é¢„筛选。"
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr "è¦è¦†ç›–默认路径,请使用下é¢é¢å¤–部分中的“DNS 目录â€é€‰é¡¹ã€‚"
@@ -325,7 +321,7 @@ msgid "View Logfile"
msgstr "查看日志文件"
msgid "Waiting for command to complete..."
-msgstr "正在执行命令..."
+msgstr "正在等待命令完æˆâ€¦"
msgid "Whitelist File"
msgstr "白åå•æ–‡ä»¶"
@@ -339,28 +335,96 @@ msgid ""
msgstr ""
"您å¯ä»¥æ‰‹åŠ¨ä½¿ç”¨æ­¤é™åˆ¶æ€§æ‹¦æˆªåˆ—表,例如:为客人æä¾› wifi 或 kidsafe é…置。"
-msgid "disabled"
-msgstr "å·²ç¦ç”¨"
-
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
-msgstr "例如:è¦æŽ¥æ”¶æ¯ä¸ª adblock 更新的电å­é‚®ä»¶é€šçŸ¥æ—¶å°†æ­¤å€¼è®¾ç½®ä¸º150000。"
+msgstr "例如:è¦æŽ¥æ”¶æ¯ä¸ª adblock 更新的电å­é‚®ä»¶é€šçŸ¥æ—¶å°†æ­¤å€¼è®¾ç½®ä¸º 150000。"
-msgid "enabled"
-msgstr "å·²å¯ç”¨"
+#~ msgid "-------"
+#~ msgstr "-------"
+
+#~ msgid "Adblock Logfile"
+#~ msgstr "Adblock 日志文件"
+
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file.<br />"
+#~ msgstr ""
+#~ "构建一个é¢å¤–的“Jailâ€åˆ—表(/tmp/adb_list.jail),除白åå•æ–‡ä»¶ä¸­åˆ—出的域å"
+#~ "外,阻止访问其他所有的域å。<br />"
+
+#~ msgid ""
+#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. "
+#~ "'libustream-ssl' or 'built-in'."
+#~ msgstr ""
+#~ "å¯¹å— SSL ä¿æŠ¤çš„拦截列表æºï¼Œæ‚¨éœ€è¦ä¸€ä¸ªåˆé€‚çš„ SSL 库,如“libustream-"
+#~ "sslâ€æˆ–“built-inâ€ã€‚"
+
+#~ msgid ""
+#~ "List of available network interfaces. Usually the startup will be "
+#~ "triggered by the 'wan' interface.<br />"
+#~ msgstr "å¯ç”¨ç½‘络接å£åˆ—表。通常å¯åŠ¨å°†ç”±â€œwanâ€æŽ¥å£è§¦å‘。<br />"
+
+#~ msgid ""
+#~ "List of supported DNS backends with their default list export directory."
+#~ "<br />"
+#~ msgstr "支æŒçš„ DNS åŽç«¯åˆ—表åŠå…¶é»˜è®¤åˆ—表导出目录。<br />"
+
+#~ msgid "Name"
+#~ msgstr "å称"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),<br />"
+#~ msgstr ""
+#~ "如果总数å°äºŽæˆ–等于给定é™åˆ¶ï¼ˆé»˜è®¤ä¸º 0),请æ高最å°ç”µå­é‚®ä»¶é€šçŸ¥æ•°ï¼Œä»¥èŽ·å–电"
+#~ "å­é‚®ä»¶ã€‚"
+
+#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+#~ msgstr "将所有 DNS 查询从“lanâ€åŒºåŸŸé‡å®šå‘到本地解æžå™¨ã€‚"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0.<br />"
+#~ msgstr "如果å‘生错误或域计数 &le; 0,å‘é€é€šçŸ¥ç”µå­é‚®ä»¶ã€‚<br />"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '4').<br />"
+#~ msgstr "处ç†ä¸‹è½½é˜Ÿåˆ—的大å°åŠå¹¶è¡Œå¤„ç†åˆ—表(默认“4â€ï¼‰ã€‚<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock blacklist (%s)."
+#~ "<br />"
+#~ msgstr "此表å•å…许您修改 adblock 黑åå•ï¼ˆ%s)的内容。<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock whitelist (%s)."
+#~ "<br />"
+#~ msgstr "此表å•å…许您修改 adblock 白åå•ï¼ˆ%s)的内容。<br />"
+
+#~ msgid ""
+#~ "This form shows the syslog output, pre-filtered for adblock related "
+#~ "messages only."
+#~ msgstr "此表å•æ˜¾ç¤ºç³»ç»Ÿæ—¥å¿—输出,仅针对 adblock 相关的消æ¯è¿›è¡Œäº†é¢„筛选。"
+
+#~ msgid "disabled"
+#~ msgstr "å·²ç¦ç”¨"
+
+#~ msgid "enabled"
+#~ msgstr "å·²å¯ç”¨"
-msgid "error"
-msgstr "错误"
+#~ msgid "error"
+#~ msgstr "错误"
-msgid "n/a"
-msgstr "ä¸å¯ç”¨"
+#~ msgid "n/a"
+#~ msgstr "ä¸å¯ç”¨"
-msgid "paused"
-msgstr "已暂åœ"
+#~ msgid "paused"
+#~ msgstr "已暂åœ"
-msgid "running"
-msgstr "è¿è¡Œä¸­"
+#~ msgid "running"
+#~ msgstr "è¿è¡Œä¸­"
#~ msgid "Invalid domain specified!"
#~ msgstr "无效域åï¼"
diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index ab3a1c4f4b..f9830a5098 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -1,11 +1,11 @@
# liushuyu <liushuyu_011@163.com>, 2017.
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2017-10-28 16:06+0800\n"
+"PO-Revision-Date: 2018-08-07 20:41+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_TW\n"
@@ -16,22 +16,18 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
msgid "'Jail' Blocklist Creation"
-msgstr ""
-
-msgid "-------"
-msgstr "-------"
+msgstr "“Jailâ€æ””截列表建立"
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!"
msgstr ""
+"<b>注æ„:</b>為防止在å°æ–¼ 64M 空閒記憶體的è£ç½®ä¸Šå‡ºç¾è¨˜æ†¶é«”ä¸è¶³ç•°å¸¸ï¼Œè«‹åªé¸æ“‡"
+"其中的幾個ï¼"
msgid "Adblock"
msgstr "Adblock"
-msgid "Adblock Logfile"
-msgstr "Adblock 日誌檔案"
-
msgid "Adblock Status"
msgstr "Adblock 狀態"
@@ -39,29 +35,29 @@ msgid "Adblock Version"
msgstr "Adblock 版本"
msgid "Additional trigger delay in seconds before adblock processing begins."
-msgstr "觸發 Adblock 開始處ç†å‰çš„é¡å¤–延é²ï¼ˆä»¥ç§’為單ä½ï¼‰ã€‚"
+msgstr "觸發 Adblock 開始處ç†å‰çš„é¡å¤–延é²ï¼ˆç§’)。"
msgid "Advanced"
msgstr "高階"
msgid "Archive Categories"
-msgstr ""
+msgstr "存檔類別"
msgid "Backup Directory"
msgstr "備份目錄"
msgid "Backup Mode"
-msgstr ""
+msgstr "備份模å¼"
msgid "Blocklist Sources"
msgstr "攔截列表來æº"
msgid "Blocklist not found!"
-msgstr ""
+msgstr "攔截列表未找到ï¼"
msgid ""
"Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to all "
-"domains except those listed in the whitelist file.<br />"
+"domains except those listed in the whitelist file."
msgstr ""
msgid ""
@@ -81,7 +77,7 @@ msgstr "Adblock é…ç½®å·¥å…·ï¼Œé€šéŽ DNS 來攔截廣告和阻止域å。"
msgid ""
"Create compressed blocklist backups, they will be used in case of download "
"errors or during startup in backup mode."
-msgstr ""
+msgstr "建立壓縮的攔截列表備份,它們將在下載錯誤或備份模å¼å•Ÿå‹•æœŸé–“使用。"
msgid "DNS Backend (DNS Directory)"
msgstr "DNS 後端(DNS 目錄)"
@@ -98,7 +94,7 @@ msgid ""
msgstr "啟動期間ä¸è¦è‡ªå‹•æ›´æ–° blocklists,改用 blocklists 的備份。"
msgid "Download Utility"
-msgstr ""
+msgstr "下載工具"
msgid "Download Utility (SSL Library)"
msgstr "下載實用程å¼ï¼ˆSSL 庫)"
@@ -113,10 +109,10 @@ msgid "Edit Whitelist"
msgstr "編輯白åå–®"
msgid "Email Notification"
-msgstr ""
+msgstr "Email æ醒"
msgid "Email Notification Count"
-msgstr ""
+msgstr "Email æ醒計數"
msgid "Enable Adblock"
msgstr "啟用 Adblock"
@@ -128,6 +124,7 @@ msgid ""
"Enable memory intense overall sort / duplicate removal on low memory devices "
"(&lt; 64 MB free RAM)"
msgstr ""
+"在低記憶體è£ç½®ä¸Šå•Ÿç”¨ç©æ¥µçš„記憶體整體排åº/é‡è¤‡ç§»é™¤ï¼ˆ&lt; 64 MB 空閒記憶體)"
msgid "Enable verbose debug logging in case of any processing error."
msgstr "在出ç¾ä»»ä½•è™•ç†éŒ¯èª¤çš„情æ³ä¸‹å•Ÿç”¨è©³ç´°é™¤éŒ¯æ—¥èªŒè¨˜éŒ„。"
@@ -139,25 +136,20 @@ msgid "Extra Options"
msgstr "é¡å¤–é¸é …"
msgid "Flush DNS Cache"
-msgstr ""
+msgstr "清空 DNS å¿«å–"
msgid "Flush DNS Cache after adblock processing."
-msgstr ""
-
-msgid ""
-"For SSL protected blocklist sources you need a suitable SSL library, e.g. "
-"'libustream-ssl' or 'built-in'."
-msgstr ""
+msgstr "在 adblock 程åºå•Ÿå‹•å¾Œæ¸…空 DNS å¿«å–。"
msgid ""
"For further information <a href=\"%s\" target=\"_blank\">check the online "
"documentation</a>"
-msgstr ""
+msgstr "進一步資訊<a href=\"%s\" target=\"_blank\">請訪å•ç·šä¸Šæ–‡æª”</a>"
msgid ""
"For further performance improvements you can raise this value, e.g. '8' or "
"'16' should be safe."
-msgstr ""
+msgstr "為了進一步æ高效能,您å¯ä»¥æ高此值,例如:8 或 16 應該是安全的。"
msgid "Force Local DNS"
msgstr "強制本地 DNS"
@@ -166,7 +158,7 @@ msgid "Force Overall Sort"
msgstr "強制整體排åº"
msgid "Full path to the whitelist file."
-msgstr ""
+msgstr "白å單檔案的全路徑。"
msgid "Input file not found, please check your configuration."
msgstr "輸入檔案未找到,請檢查您的é…置。"
@@ -176,25 +168,24 @@ msgstr "最後執行"
msgid ""
"List of available network interfaces. Usually the startup will be triggered "
-"by the 'wan' interface.<br />"
+"by the 'wan' interface."
msgstr ""
msgid ""
-"List of supported DNS backends with their default list export directory.<br /"
-">"
-msgstr "支æ´çš„ DNS 後端列表åŠå…¶é è¨­åˆ—表匯出目錄。<br />"
+"List of supported DNS backends with their default list export directory."
+msgstr ""
msgid "List of supported and fully pre-configured download utilities."
-msgstr ""
+msgstr "支æ´å’Œå®Œå…¨é é…置的下載工具列表。"
msgid "Loading"
msgstr "載入中"
-msgid "Max. Download Queue"
+msgid "Low Priority Service"
msgstr ""
-msgid "Name"
-msgstr ""
+msgid "Max. Download Queue"
+msgstr "最大下載佇列"
msgid "No"
msgstr "å¦"
@@ -204,7 +195,7 @@ msgid ""
msgstr "在é è¨­è¨­å®šä¸¦ä¸é©åˆæ‚¨æ™‚çš„é¡å¤–é¸é …。"
msgid "Overall Domains"
-msgstr ""
+msgstr "域å總覽"
msgid "Overview"
msgstr "總覽"
@@ -213,15 +204,15 @@ msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
"allowed - ip addresses, wildcards and regex are not."
msgstr ""
-"è«‹æ¯è¡Œåªæ–°å¢žä¸€å€‹åŸŸã€‚å…許使用'#'開頭的註釋 - ip ä½å€ã€è¬ç”¨å­—元和正則表示å¼éƒ½"
-"ä¸å…許。"
+"è«‹æ¯è¡Œåªæ–°å¢žä¸€å€‹åŸŸã€‚å…許使用“#â€é–‹é ­çš„註釋 - ip ä½å€ã€è¬ç”¨å­—元和正則表示å¼éƒ½ä¸"
+"å…許。"
msgid "Please edit this file directly in a terminal session."
msgstr "請在終端會話中直接編輯此檔案。"
msgid ""
"Please note: this needs additional 'msmtp' package installation and setup."
-msgstr ""
+msgstr "請注æ„:這需è¦é¡å¤–的“msmtpâ€è»Ÿé«”包安è£å’Œè¨­å®šã€‚"
msgid "Query"
msgstr "查詢"
@@ -231,11 +222,19 @@ msgstr "查詢域"
msgid ""
"Raise the minimum email notification count, to get emails if the overall "
-"count is less or equal to the given limit (default 0),<br />"
+"count is less or equal to the given limit (default 0),"
+msgstr ""
+
+msgid ""
+"Redirect all DNS queries from 'lan' zone to the local resolver, apply to udp "
+"and tcp protocol on ports 53, 853 and 5353."
msgstr ""
-msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
-msgstr "將所有 DNS 查詢從“lanâ€å€åŸŸé‡å®šå‘到本地解æžå™¨ã€‚"
+msgid "Refresh"
+msgstr ""
+
+msgid "Refresh Blocklist Sources"
+msgstr ""
msgid "Resume"
msgstr "æ¢å¾©"
@@ -251,12 +250,17 @@ msgstr "儲存"
msgid ""
"Send notification emails in case of a processing error or if domain count is "
-"&le; 0.<br />"
+"&le; 0."
+msgstr ""
+
+msgid ""
+"Set the nice level to 'low priority' and the adblock background processing "
+"will take less resources from the system."
msgstr ""
msgid ""
"Size of the download queue to handle downloads &amp; list processing in "
-"parallel (default '4').<br />"
+"parallel (default '4')."
msgstr ""
msgid "Startup Trigger"
@@ -271,23 +275,27 @@ msgstr "æš«åœ/æ¢å¾© Adblock"
msgid ""
"Target directory for adblock backups. Please use only non-volatile disks, e."
"g. an external usb stick."
-msgstr ""
+msgstr "adblock 備份的目標目錄。請僅使用éžæ˜“失性ç£ç¢Ÿï¼Œä¾‹å¦‚:一個外接 U 盤。"
msgid "Target directory for the generated blocklist 'adb_list.overall'."
-msgstr "生æˆçš„ blocklist 'adb_list.overall'的目標目錄。"
+msgstr "生æˆæ””截列表“adb_list.overallâ€çš„目標目錄。"
msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
+msgstr "檔案éŽå¤§ï¼Œç„¡æ³•ä½¿ç”¨ LuCI 的線上編輯(&ge; 100 KB)。"
+
+msgid "The syslog output, pre-filtered for adblock related messages only."
+msgstr ""
+
+msgid "This change requires a manual service stop/re-start to take effect."
msgstr ""
msgid ""
"This form allows you to modify the content of the adblock blacklist (%s)."
-"<br />"
-msgstr "此表單å…許您修改 adblock 黑å單(%s)的內容。<br />"
+msgstr ""
msgid ""
"This form allows you to modify the content of the adblock whitelist (%s)."
-"<br />"
-msgstr "此表單å…許您修改 adblock 白å單(%s)的內容。<br />"
+msgstr ""
msgid ""
"This form allows you to modify the content of the main adblock configuration "
@@ -300,11 +308,6 @@ msgid ""
msgstr "此表單å…許您查詢æŸäº›åŸŸçš„活動塊列表,例如用於列出白å單。"
msgid ""
-"This form shows the syslog output, pre-filtered for adblock related messages "
-"only."
-msgstr "此表單顯示系統日誌輸出,僅é‡å° adblock 相關的訊æ¯é€²è¡Œäº†é ç¯©é¸ã€‚"
-
-msgid ""
"To overwrite the default path use the 'DNS Directory' option in the extra "
"section below."
msgstr "è¦è¦†è“‹é è¨­è·¯å¾‘,請使用下é¢é¡å¤–部分中的“DNS 目錄â€é¸é …。"
@@ -319,10 +322,10 @@ msgid "View Logfile"
msgstr "檢視日誌檔案"
msgid "Waiting for command to complete..."
-msgstr "正在執行命令..."
+msgstr "正在等待指令完æˆâ€¦"
msgid "Whitelist File"
-msgstr ""
+msgstr "白å單檔案"
msgid "Yes"
msgstr "是"
@@ -331,29 +334,98 @@ msgid ""
"You can use this restrictive blocklist manually e.g. for guest wifi or "
"kidsafe configurations."
msgstr ""
-
-msgid "disabled"
-msgstr "å·²ç¦ç”¨"
+"您å¯ä»¥æ‰‹å‹•ä½¿ç”¨æ­¤é™åˆ¶æ€§æ””截列表,例如:為客人æä¾› wifi 或 kidsafe é…置。"
msgid ""
"e.g. to receive an email notification with every adblock update set this "
"value to 150000."
-msgstr ""
+msgstr "例如:è¦æŽ¥æ”¶æ¯å€‹ adblock æ›´æ–°çš„é›»å­éƒµä»¶é€šçŸ¥æ™‚將此值設定為 150000。"
-msgid "enabled"
-msgstr "已啟用"
+#~ msgid "-------"
+#~ msgstr "-------"
-msgid "error"
-msgstr "錯誤"
+#~ msgid "Adblock Logfile"
+#~ msgstr "Adblock 日誌檔案"
-msgid "n/a"
-msgstr "ä¸å¯ç”¨"
+#~ msgid ""
+#~ "Builds an additional 'Jail' list (/tmp/adb_list.jail) to block access to "
+#~ "all domains except those listed in the whitelist file.<br />"
+#~ msgstr ""
+#~ "構建一個é¡å¤–的“Jailâ€åˆ—表(/tmp/adb_list.jail),除白å單檔案中列出的域å"
+#~ "外,阻止訪å•å…¶ä»–所有的域å。<br />"
-msgid "paused"
-msgstr "已暫åœ"
+#~ msgid ""
+#~ "For SSL protected blocklist sources you need a suitable SSL library, e.g. "
+#~ "'libustream-ssl' or 'built-in'."
+#~ msgstr ""
+#~ "å°å— SSL ä¿è­·çš„攔截列表æºï¼Œæ‚¨éœ€è¦ä¸€å€‹åˆé©çš„ SSL 庫,如“libustream-"
+#~ "sslâ€æˆ–“built-inâ€ã€‚"
-msgid "running"
-msgstr ""
+#~ msgid ""
+#~ "List of available network interfaces. Usually the startup will be "
+#~ "triggered by the 'wan' interface.<br />"
+#~ msgstr "å¯ç”¨ç¶²è·¯ä»‹é¢åˆ—表。通常啟動將由“wanâ€ä»‹é¢è§¸ç™¼ã€‚<br />"
+
+#~ msgid ""
+#~ "List of supported DNS backends with their default list export directory."
+#~ "<br />"
+#~ msgstr "支æ´çš„ DNS 後端列表åŠå…¶é è¨­åˆ—表匯出目錄。<br />"
+
+#~ msgid "Name"
+#~ msgstr "å稱"
+
+#~ msgid ""
+#~ "Raise the minimum email notification count, to get emails if the overall "
+#~ "count is less or equal to the given limit (default 0),<br />"
+#~ msgstr ""
+#~ "如果總數å°æ–¼æˆ–等於給定é™åˆ¶ï¼ˆé è¨­ç‚º 0),請æ高最å°é›»å­éƒµä»¶é€šçŸ¥æ•¸ï¼Œä»¥ç²å–é›»"
+#~ "å­éƒµä»¶ã€‚"
+
+#~ msgid "Redirect all DNS queries from 'lan' zone to the local resolver."
+#~ msgstr "將所有 DNS 查詢從“lanâ€å€åŸŸé‡å®šå‘到本地解æžå™¨ã€‚"
+
+#~ msgid ""
+#~ "Send notification emails in case of a processing error or if domain count "
+#~ "is &le; 0.<br />"
+#~ msgstr "如果發生錯誤或域計數 &le; 0,傳é€é€šçŸ¥é›»å­éƒµä»¶ã€‚<br />"
+
+#~ msgid ""
+#~ "Size of the download queue to handle downloads &amp; list processing in "
+#~ "parallel (default '4').<br />"
+#~ msgstr "處ç†ä¸‹è¼‰ä½‡åˆ—的大å°åŠä¸¦è¡Œè™•ç†åˆ—表(é è¨­â€œ4â€ï¼‰ã€‚<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock blacklist (%s)."
+#~ "<br />"
+#~ msgstr "此表單å…許您修改 adblock 黑å單(%s)的內容。<br />"
+
+#~ msgid ""
+#~ "This form allows you to modify the content of the adblock whitelist (%s)."
+#~ "<br />"
+#~ msgstr "此表單å…許您修改 adblock 白å單(%s)的內容。<br />"
+
+#~ msgid ""
+#~ "This form shows the syslog output, pre-filtered for adblock related "
+#~ "messages only."
+#~ msgstr "此表單顯示系統日誌輸出,僅é‡å° adblock 相關的訊æ¯é€²è¡Œäº†é ç¯©é¸ã€‚"
+
+#~ msgid "disabled"
+#~ msgstr "å·²ç¦ç”¨"
+
+#~ msgid "enabled"
+#~ msgstr "已啟用"
+
+#~ msgid "error"
+#~ msgstr "錯誤"
+
+#~ msgid "n/a"
+#~ msgstr "ä¸å¯ç”¨"
+
+#~ msgid "paused"
+#~ msgstr "已暫åœ"
+
+#~ msgid "running"
+#~ msgstr "執行中"
#~ msgid "Invalid domain specified!"
#~ msgstr "無效域åï¼"
diff --git a/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
new file mode 100644
index 0000000000..1e70dbbd4f
--- /dev/null
+++ b/applications/luci-app-advanced-reboot/po/zh-cn/advanced-reboot.po
@@ -0,0 +1,149 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 20:31+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Action"
+msgstr "动作"
+
+msgid "Advanced Reboot"
+msgstr "高级é‡å¯"
+
+msgid "Alternative"
+msgstr "备用"
+
+msgid "Cancel"
+msgstr "å–消"
+
+msgid "Confirm"
+msgstr "确认"
+
+msgid "Current"
+msgstr "当å‰"
+
+msgid "ERROR:"
+msgstr "错误:"
+
+msgid "Firmware/OS (Kernel)"
+msgstr "固件/OS(内核)"
+
+msgid "No access to fw_printenv or fw_printenv!"
+msgstr "无法访问 fw_printenv 或 fw_printenvï¼"
+
+msgid "Partition"
+msgstr "分区"
+
+msgid "Partitions"
+msgstr "分区"
+
+msgid "Perform power off..."
+msgstr "执行关机…"
+
+msgid "Power Off Device"
+msgstr "设备关机"
+
+msgid "Proceed"
+msgstr "继续"
+
+msgid "Reboot Device to an Alternative Partition"
+msgstr "将设备é‡å¯è‡³å¤‡ç”¨åˆ†åŒº"
+
+msgid "Reboot to alternative partition..."
+msgstr "é‡å¯åˆ°å¤‡ç”¨åˆ†åŒºâ€¦"
+
+msgid "Reboot to current partition"
+msgstr "é‡å¯åˆ°å½“å‰åˆ†åŒº"
+
+msgid "Rebooting..."
+msgstr "正在é‡å¯â€¦"
+
+msgid "Shutting down..."
+msgstr "正在关机…"
+
+msgid "Status"
+msgstr "状æ€"
+
+msgid ""
+"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"系统正在é‡å¯ã€‚<br />切勿关闭电æºï¼ DO NOT POWER OFF THE DEVICE!<br />等待数分"
+"é’ŸåŽå³å¯å°è¯•é‡æ–°è¿žæŽ¥åˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è®¡ç®—机的 IP 地å€ä»¥é‡æ–°è¿žæŽ¥ã€‚"
+
+msgid ""
+"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
+"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
+"might be necessary to renew the address of your computer to reach the device "
+"again, depending on your settings."
+msgstr ""
+"系统现在正在é‡å¯åˆ°å¤‡ç”¨åˆ†åŒºã€‚<br />切勿关闭电æºï¼ DO NOT POWER OFF THE DEVICE!"
+"<br />等待数分钟åŽå³å¯å°è¯•é‡æ–°è¿žæŽ¥åˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è®¡ç®—机的 IP 地å€ä»¥é‡"
+"新连接。"
+
+msgid ""
+"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
+"might be necessary to renew the address of your computer to reach the device "
+"again, depending on your settings."
+msgstr ""
+"系统现在正在关机。<br />切勿关闭电æºï¼ DO NOT POWER OFF THE DEVICE!<br />等待"
+"数分钟åŽå³å¯å°è¯•é‡æ–°è¿žæŽ¥åˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è®¡ç®—机的 IP 地å€ä»¥é‡æ–°è¿žæŽ¥ã€‚"
+
+msgid "Unable to find Dual Boot Flag Partition."
+msgstr "无法找到åŒå¼•å¯¼æ ‡å¿—分区。"
+
+msgid "Unable to obtain firmware environment variable"
+msgstr "无法获å–固件环境å˜é‡"
+
+msgid "Unable to set Dual Boot Flag Partition entry for partition"
+msgstr "无法为分区设置åŒå¼•å¯¼æ ‡å¿—分区项"
+
+msgid "Unable to set firmware environment variable"
+msgstr "无法设置固件环境å˜é‡"
+
+msgid ""
+"WARNING: An alternative partition might have its own settings and completely "
+"different firmware.<br /><br /> As your network configuration and WiFi SSID/"
+"password on alternative partition might be different, you might have to "
+"adjust your computer settings to be able to access your device once it "
+"reboots.<br /><br /> Please also be aware that alternative partition "
+"firmware might not provide an easy way to switch active partition and boot "
+"back to the currently active partition.<br /><br /> Click \"Proceed\" below "
+"to reboot device to an alternative partition."
+msgstr ""
+"警告:备用分区的设置和固件å¯èƒ½ä¸Žå½“å‰å®Œå…¨ä¸åŒã€‚<br /><br />由于备用分区上的网"
+"络é…置和 WiFi SSID/密ç å¯èƒ½ä¸åŒï¼Œåœ¨è®¾å¤‡é‡å¯åŽï¼Œæ‚¨å¯èƒ½éœ€è¦è°ƒæ•´è®¡ç®—机设置æ‰èƒ½è®¿"
+"问您的设备。<br /><br />请注æ„,备用分区固件å¯èƒ½æ— æ³•æ供切æ¢æ´»åŠ¨åˆ†åŒºå’Œå¼•å¯¼å›ž"
+"当å‰æ´»åŠ¨åˆ†åŒºçš„简便方法。<br /><br />点击下方“继续â€ï¼Œä½¿è®¾å¤‡é‡å¯è‡³å¤‡ç”¨åˆ†åŒºã€‚"
+
+msgid ""
+"WARNING: Power off might result in a reboot on a device which doesn't "
+"support power off.<br /><br /> Click \"Proceed\" below to power off your "
+"device."
+msgstr ""
+"警告:对于ä¸æ”¯æŒå…³æœºçš„设备,关机å¯èƒ½ä¼šå¯¼è‡´é‡æ–°å¯åŠ¨ã€‚<br /><br />点击下方“继"
+"ç»­â€ï¼Œä½¿è®¾å¤‡å…³æœºã€‚"
+
+msgid "Warning: Device (%s) is unknown or isn't a dual-partition device!"
+msgstr "警告:设备(%s)未知或ä¸æ˜¯åŒåˆ†åŒºè®¾å¤‡ï¼"
+
+msgid "Warning: There are unsaved changes that will get lost on reboot!"
+msgstr "警告:未ä¿å­˜çš„更改会在é‡å¯æ—¶ä¸¢å¤±ï¼"
+
+msgid "Warning: This system does not support powering off!"
+msgstr "警告:此系统ä¸æ”¯æŒå…³é—­ç”µæºï¼"
+
+msgid "Warning: Unable to obtain device information!"
+msgstr "警告:无法获å–设备信æ¯ï¼"
+
+msgid "to"
+msgstr "至"
diff --git a/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
new file mode 100644
index 0000000000..ddf53bca6d
--- /dev/null
+++ b/applications/luci-app-advanced-reboot/po/zh-tw/advanced-reboot.po
@@ -0,0 +1,150 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 20:31+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Advanced Reboot"
+msgstr "高階é‡å•Ÿ"
+
+msgid "Alternative"
+msgstr "備用"
+
+msgid "Cancel"
+msgstr "å–消"
+
+msgid "Confirm"
+msgstr "確èª"
+
+msgid "Current"
+msgstr "當å‰"
+
+msgid "ERROR:"
+msgstr "錯誤:"
+
+msgid "Firmware/OS (Kernel)"
+msgstr "韌體/OS(核心)"
+
+msgid "No access to fw_printenv or fw_printenv!"
+msgstr "ç„¡æ³•è¨ªå• fw_printenv 或 fw_printenvï¼"
+
+msgid "Partition"
+msgstr "分割槽"
+
+msgid "Partitions"
+msgstr "分割槽"
+
+msgid "Perform power off..."
+msgstr "執行關機…"
+
+msgid "Power Off Device"
+msgstr "è£ç½®é—œæ©Ÿ"
+
+msgid "Proceed"
+msgstr "繼續"
+
+msgid "Reboot Device to an Alternative Partition"
+msgstr "å°‡è£ç½®é‡å•Ÿè‡³å‚™ç”¨åˆ†å‰²æ§½"
+
+msgid "Reboot to alternative partition..."
+msgstr "é‡å•Ÿåˆ°å‚™ç”¨åˆ†å‰²æ§½â€¦"
+
+msgid "Reboot to current partition"
+msgstr "é‡å•Ÿåˆ°ç•¶å‰åˆ†å‰²æ§½"
+
+msgid "Rebooting..."
+msgstr "正在é‡å•Ÿâ€¦"
+
+msgid "Shutting down..."
+msgstr "正在關機…"
+
+msgid "Status"
+msgstr "狀態"
+
+msgid ""
+"The system is rebooting now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
+"few minutes before you try to reconnect. It might be necessary to renew the "
+"address of your computer to reach the device again, depending on your "
+"settings."
+msgstr ""
+"系統正在é‡å•Ÿã€‚<br />切勿關閉電æºï¼ DO NOT POWER OFF THE DEVICE!<br />等待數分"
+"é¾å¾Œå³å¯å˜—試é‡æ–°é€£ç·šåˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è¨ˆç®—æ©Ÿçš„ IP ä½å€ä»¥é‡æ–°é€£ç·šã€‚"
+
+msgid ""
+"The system is rebooting to an alternative partition now.<br /> DO NOT POWER "
+"OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It "
+"might be necessary to renew the address of your computer to reach the device "
+"again, depending on your settings."
+msgstr ""
+"系統ç¾åœ¨æ­£åœ¨é‡å•Ÿåˆ°å‚™ç”¨åˆ†å‰²æ§½ã€‚<br />切勿關閉電æºï¼ DO NOT POWER OFF THE "
+"DEVICE!<br />等待數分é˜å¾Œå³å¯å˜—試é‡æ–°é€£ç·šåˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è¨ˆç®—æ©Ÿçš„ IP 地"
+"å€ä»¥é‡æ–°é€£ç·šã€‚"
+
+msgid ""
+"The system is shutting down now.<br /> DO NOT POWER OFF THE DEVICE!<br /> It "
+"might be necessary to renew the address of your computer to reach the device "
+"again, depending on your settings."
+msgstr ""
+"系統ç¾åœ¨æ­£åœ¨é—œæ©Ÿã€‚<br />切勿關閉電æºï¼ DO NOT POWER OFF THE DEVICE!<br />等待"
+"數分é˜å¾Œå³å¯å˜—試é‡æ–°é€£ç·šåˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è¨ˆç®—æ©Ÿçš„ IP ä½å€ä»¥é‡æ–°é€£ç·šã€‚"
+
+msgid "Unable to find Dual Boot Flag Partition."
+msgstr "無法找到雙引導標誌分割槽。"
+
+msgid "Unable to obtain firmware environment variable"
+msgstr "無法ç²å–韌體環境變數"
+
+msgid "Unable to set Dual Boot Flag Partition entry for partition"
+msgstr "無法為分割槽設定雙引導標誌分割槽項"
+
+msgid "Unable to set firmware environment variable"
+msgstr "無法設定韌體環境變數"
+
+msgid ""
+"WARNING: An alternative partition might have its own settings and completely "
+"different firmware.<br /><br /> As your network configuration and WiFi SSID/"
+"password on alternative partition might be different, you might have to "
+"adjust your computer settings to be able to access your device once it "
+"reboots.<br /><br /> Please also be aware that alternative partition "
+"firmware might not provide an easy way to switch active partition and boot "
+"back to the currently active partition.<br /><br /> Click \"Proceed\" below "
+"to reboot device to an alternative partition."
+msgstr ""
+"警告:備用分割槽的設定和韌體å¯èƒ½èˆ‡ç•¶å‰å®Œå…¨ä¸åŒã€‚<br /><br />由於備用分割槽上"
+"的網路é…置和 WiFi SSID/密碼å¯èƒ½ä¸åŒï¼Œåœ¨è£ç½®é‡å•Ÿå¾Œï¼Œæ‚¨å¯èƒ½éœ€è¦èª¿æ•´è¨ˆç®—機設定æ‰"
+"能訪å•æ‚¨çš„è£ç½®ã€‚<br /><br />請注æ„,備用分割槽韌體å¯èƒ½ç„¡æ³•æ供切æ›æ´»å‹•åˆ†å‰²æ§½"
+"和引導回當å‰æ´»å‹•åˆ†å‰²æ§½çš„簡便方法。<br /><br />點é¸ä¸‹æ–¹â€œç¹¼çºŒâ€ï¼Œä½¿è£ç½®é‡å•Ÿè‡³å‚™"
+"用分割槽。"
+
+msgid ""
+"WARNING: Power off might result in a reboot on a device which doesn't "
+"support power off.<br /><br /> Click \"Proceed\" below to power off your "
+"device."
+msgstr ""
+"警告:å°æ–¼ä¸æ”¯æ´é—œæ©Ÿçš„è£ç½®ï¼Œé—œæ©Ÿå¯èƒ½æœƒå°Žè‡´é‡æ–°å•Ÿå‹•ã€‚<br /><br />點é¸ä¸‹æ–¹â€œç¹¼"
+"續â€ï¼Œä½¿è£ç½®é—œæ©Ÿã€‚"
+
+msgid "Warning: Device (%s) is unknown or isn't a dual-partition device!"
+msgstr "警告:è£ç½®ï¼ˆ%s)未知或ä¸æ˜¯é›™åˆ†å‰²æ§½è£ç½®ï¼"
+
+msgid "Warning: There are unsaved changes that will get lost on reboot!"
+msgstr "警告:未儲存的更改會在é‡å•Ÿæ™‚丟失ï¼"
+
+msgid "Warning: This system does not support powering off!"
+msgstr "警告:此係統ä¸æ”¯æ´é—œé–‰é›»æºï¼"
+
+msgid "Warning: Unable to obtain device information!"
+msgstr "警告:無法ç²å–è£ç½®è³‡è¨Šï¼"
+
+msgid "to"
+msgstr "至"
diff --git a/applications/luci-app-ahcp/po/zh-cn/ahcp.po b/applications/luci-app-ahcp/po/zh-cn/ahcp.po
index 295bbe7f12..84ff5eab15 100644
--- a/applications/luci-app-ahcp/po/zh-cn/ahcp.po
+++ b/applications/luci-app-ahcp/po/zh-cn/ahcp.po
@@ -1,32 +1,34 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-10-09 03:31+0200\n"
-"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 20:36+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "AHCP Server"
msgstr "AHCP æœåŠ¡å™¨"
-#, fuzzy
msgid ""
"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
"networks designed to be used in place of router discovery or DHCP on "
"networks where it is difficult or impossible to configure a server within "
"every link-layer broadcast domain, for example mobile ad-hoc networks."
msgstr ""
-"AHCP是一个自动é…ç½®IPv6å’ŒIPv6/IPv4åŒæ ˆç½‘络的å议,用于在网络上进行路由探测和地"
-"å€åˆ†é…。因为在æŸäº›ç½‘络上为æ¯ä¸ªé“¾è·¯å±‚广播域å‡é…ç½®æœåŠ¡å™¨æ˜¯éžå¸¸å›°éš¾çš„,例如移动"
-"ad-hoc网络。"
+"AHCP 是一个自动é…ç½® IPv6 å’Œ IPv6/IPv4 åŒæ ˆç½‘络的å议,用于在网络上进行路由探"
+"测和地å€åˆ†é…。因为在æŸäº›ç½‘络上为æ¯ä¸ªé“¾è·¯å±‚广播域å‡é…ç½®æœåŠ¡å™¨æ˜¯éžå¸¸å›°éš¾çš„,例"
+"如移动 ad-hoc 网络。"
msgid "Active AHCP Leases"
-msgstr "活动的AHCP租约"
+msgstr "活动的 AHCP 租约"
msgid "Address"
msgstr "地å€"
@@ -38,16 +40,16 @@ msgid "Age"
msgstr "有效期"
msgid "Announced DNS servers"
-msgstr "公布DNSæœåŠ¡å™¨"
+msgstr "通告的 DNS æœåŠ¡å™¨"
msgid "Announced NTP servers"
-msgstr "公布NTPæœåŠ¡å™¨"
+msgstr "通告的 NTP æœåŠ¡å™¨"
msgid "Announced prefixes"
-msgstr "公布地å€å‰ç¼€"
+msgstr "通告的地å€å‰ç¼€"
msgid "Collecting data..."
-msgstr "æ•°æ®æ”¶é›†ä¸­..."
+msgstr "正在收集数æ®â€¦"
msgid "Forwarder"
msgstr "转å‘器"
@@ -56,19 +58,19 @@ msgid "General Setup"
msgstr "通用设置"
msgid "IPv4 and IPv6"
-msgstr "IPv4å’ŒIPv6"
+msgstr "IPv4 和 IPv6"
msgid "IPv4 only"
-msgstr "ä»…IPv4"
+msgstr "ä»… IPv4"
msgid "IPv6 only"
-msgstr "ä»…IPv6"
+msgstr "ä»… IPv6"
msgid "Lease directory"
-msgstr "租èµç›®å½•"
+msgstr "租约目录"
msgid "Lease validity time"
-msgstr "租约有效期"
+msgstr "租期"
msgid "Log file"
msgstr "日志文件"
@@ -92,22 +94,22 @@ msgid "Server"
msgstr "æœåŠ¡å™¨"
msgid "Specifies the announced IPv4 and IPv6 NTP servers"
-msgstr "指定IPv4与IPv6 时间æœåŠ¡å™¨"
+msgstr "指定通告的 IPv4 与 IPv6 时间æœåŠ¡å™¨"
msgid "Specifies the announced IPv4 and IPv6 name servers"
-msgstr "指定IPv4与IPv6 域åæœåŠ¡å™¨"
+msgstr "指定通告的 IPv4 与 IPv6 域åæœåŠ¡å™¨"
msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
-msgstr "指定IPv4与IPv6网络地å€å‰ç¼€(CIDR表示法)"
+msgstr "指定通告的 IPv4 与 IPv6 网络地å€å‰ç¼€ï¼ˆCIDR表示法)"
msgid "The AHCP Service is not running."
-msgstr "AHCPæœåŠ¡æ²¡æœ‰è¿è¡Œã€‚"
+msgstr "AHCP æœåŠ¡æ²¡æœ‰è¿è¡Œã€‚"
msgid "The AHCP Service is running with ID %s."
-msgstr "AHCPæœåŠ¡ç¨‹åºè¿›ç¨‹ID %s"
+msgstr "AHCP æœåŠ¡ç¨‹åºè¿›ç¨‹ ID %s。"
msgid "There are no active leases."
msgstr "没有活跃租约。"
msgid "Unique ID file"
-msgstr "UID文件"
+msgstr "UID 文件"
diff --git a/applications/luci-app-ahcp/po/zh-tw/ahcp.po b/applications/luci-app-ahcp/po/zh-tw/ahcp.po
index dc7f6c5a00..ece06d26bf 100644
--- a/applications/luci-app-ahcp/po/zh-tw/ahcp.po
+++ b/applications/luci-app-ahcp/po/zh-tw/ahcp.po
@@ -1,18 +1,21 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-08-10 12:30+0200\n"
-"Last-Translator: mp607 <mickey60711@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 20:36+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "AHCP Server"
-msgstr "AHCP伺æœå™¨"
+msgstr "AHCP 伺æœå™¨"
msgid ""
"AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
@@ -20,90 +23,93 @@ msgid ""
"networks where it is difficult or impossible to configure a server within "
"every link-layer broadcast domain, for example mobile ad-hoc networks."
msgstr ""
+"AHCP 是一個自動é…ç½® IPv6 å’Œ IPv6/IPv4 雙棧網路的å”議,用於在網路上進行路由探"
+"測和ä½å€åˆ†é…。因為在æŸäº›ç¶²è·¯ä¸Šç‚ºæ¯å€‹éˆè·¯å±¤å»£æ’­åŸŸå‡é…置伺æœå™¨æ˜¯éžå¸¸å›°é›£çš„,例"
+"如移動 ad-hoc 網路。"
msgid "Active AHCP Leases"
-msgstr ""
+msgstr "活動的 AHCP 租約"
msgid "Address"
-msgstr "ä½ç½®"
+msgstr "ä½å€"
msgid "Advanced Settings"
-msgstr "進階設定"
+msgstr "高階設定"
msgid "Age"
-msgstr ""
+msgstr "有效期"
msgid "Announced DNS servers"
-msgstr "匿åçš„DNS伺æœå™¨"
+msgstr "宣告的 DNS 伺æœå™¨"
msgid "Announced NTP servers"
-msgstr "匿åçš„NTP伺æœå™¨"
+msgstr "宣告的 NTP 伺æœå™¨"
msgid "Announced prefixes"
-msgstr "匿åçš„å‰ç¶´"
+msgstr "宣告的ä½å€å­—首"
msgid "Collecting data..."
-msgstr "收集資料"
+msgstr "正在收集資料…"
msgid "Forwarder"
-msgstr ""
+msgstr "轉發器"
msgid "General Setup"
-msgstr "一般設定"
+msgstr "通用設定"
msgid "IPv4 and IPv6"
msgstr "IPv4 和 IPv6"
msgid "IPv4 only"
-msgstr "åªæœ‰IPv4"
+msgstr "僅 IPv4"
msgid "IPv6 only"
-msgstr "åªæœ‰IPv6"
+msgstr "僅 IPv6"
msgid "Lease directory"
-msgstr "租用目錄"
+msgstr "租約目錄"
msgid "Lease validity time"
-msgstr "租用有效時間"
+msgstr "租期"
msgid "Log file"
-msgstr "記錄檔"
+msgstr "日誌檔案"
msgid "Multicast address"
-msgstr "多點廣播ä½ç½®"
+msgstr "多播ä½å€"
msgid "Operation mode"
-msgstr "æ“作模å¼"
+msgstr "工作模å¼"
msgid "Port"
-msgstr "通訊埠"
+msgstr "埠"
msgid "Protocol family"
-msgstr "å”定群組"
+msgstr "å”è­°ç°‡"
msgid "Served interfaces"
-msgstr "æä¾›æœå‹™çš„ç•Œé¢"
+msgstr "æœå‹™ä»‹é¢"
msgid "Server"
msgstr "伺æœå™¨"
msgid "Specifies the announced IPv4 and IPv6 NTP servers"
-msgstr "特別的匿åIPv4 與 IPv6 NTP 伺æœå™¨"
+msgstr "指定宣告的 IPv4 與 IPv6 時間伺æœå™¨"
msgid "Specifies the announced IPv4 and IPv6 name servers"
-msgstr "特別的匿åIPv4 與 IPv6 å稱伺æœå™¨"
+msgstr "指定宣告的 IPv4 與 IPv6 域å伺æœå™¨"
msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
-msgstr "特別的匿åIPv4 與 IPv6 網路CIDRå‰ç¶´"
+msgstr "指定宣告的 IPv4 與 IPv6 網路ä½å€å­—首(CIDR表示法)"
msgid "The AHCP Service is not running."
-msgstr "AHCPæœå‹™æ²’有é‹ä½œ"
+msgstr "AHCP æœå‹™æ²’有執行。"
msgid "The AHCP Service is running with ID %s."
-msgstr "AHCPæœå‹™é‹ä½œä¸­ ID為 %s"
+msgstr "AHCP 伺æœç¨‹å¼ ID %s。"
msgid "There are no active leases."
-msgstr "沒有使用中的租用"
+msgstr "沒有活èºç§Ÿç´„。"
msgid "Unique ID file"
-msgstr "ç¨ç«‹çš„ID檔案"
+msgstr "UID 檔案"
diff --git a/applications/luci-app-aria2/po/zh-cn/aria2.po b/applications/luci-app-aria2/po/zh-cn/aria2.po
index 0b7eea21c7..3acd3c616d 100644
--- a/applications/luci-app-aria2/po/zh-cn/aria2.po
+++ b/applications/luci-app-aria2/po/zh-cn/aria2.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-28 16:10+0800\n"
+"PO-Revision-Date: 2018-08-07 17:11+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "\"Falloc\" is not available in all cases."
@@ -21,7 +21,7 @@ msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
msgstr "å¯ç”¨<abbr title=\"本地节点å‘现\">LPD</abbr>"
msgid "Additional Bt tracker enabled"
-msgstr "添加é¢å¤–çš„Tracker"
+msgstr "é¢å¤–添加的 Bt tracker"
msgid "Aria2"
msgstr "Aria2"
@@ -83,7 +83,7 @@ msgid "Follow torrent"
msgstr "自动添加下载的ç§å­"
msgid "General Settings"
-msgstr ""
+msgstr "常规设置"
msgid "Generate Randomly"
msgstr "éšæœºç”Ÿæˆ"
diff --git a/applications/luci-app-aria2/po/zh-tw/aria2.po b/applications/luci-app-aria2/po/zh-tw/aria2.po
index d6782cf7fe..2bd9041b96 100644
--- a/applications/luci-app-aria2/po/zh-tw/aria2.po
+++ b/applications/luci-app-aria2/po/zh-tw/aria2.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-28 16:10+0800\n"
+"PO-Revision-Date: 2018-08-07 17:11+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "\"Falloc\" is not available in all cases."
@@ -21,7 +21,7 @@ msgid "<abbr title=\"Local Peer Discovery\">LPD</abbr> enabled"
msgstr "啟用<abbr title=\"本地節點發ç¾\">LPD</abbr>"
msgid "Additional Bt tracker enabled"
-msgstr "新增é¡å¤–çš„Tracker"
+msgstr "é¡å¤–新增的 Bt tracker"
msgid "Aria2"
msgstr "Aria2"
@@ -83,7 +83,7 @@ msgid "Follow torrent"
msgstr "自動新增下載的種å­"
msgid "General Settings"
-msgstr ""
+msgstr "常è¦è¨­å®š"
msgid "Generate Randomly"
msgstr "隨機生æˆ"
diff --git a/applications/luci-app-clamav/po/zh-tw/clamav.po b/applications/luci-app-clamav/po/zh-tw/clamav.po
new file mode 100644
index 0000000000..6374e35f9c
--- /dev/null
+++ b/applications/luci-app-clamav/po/zh-tw/clamav.po
@@ -0,0 +1,131 @@
+# liushuyu <liushuyu_011@163.com>, 2017.
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2017-04-15 21:37-0600\n"
+"Language-Team: Chinese <kde-i18n-doc@kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.0.1\n"
+"Last-Translator: liushuyu <liushuyu011@gmail.com>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_TW\n"
+
+msgid "10"
+msgstr "10"
+
+msgid "1024"
+msgstr "1024"
+
+msgid "15"
+msgstr "15"
+
+msgid "150M"
+msgstr "150M"
+
+msgid "1M"
+msgstr "1M"
+
+msgid "20"
+msgstr "20"
+
+msgid "2048"
+msgstr "2048"
+
+msgid "2M"
+msgstr "2M"
+
+msgid "50M"
+msgstr "50M"
+
+msgid "512K"
+msgstr "512K"
+
+msgid "600"
+msgstr "600"
+
+msgid "Block encrypted archives"
+msgstr "攔截加密的歸檔檔案"
+
+msgid "ClamAV"
+msgstr "ClamAV"
+
+msgid "Database check every N sec"
+msgstr "æ¯ N 秒檢測一次資料庫"
+
+msgid "Detect broken executables"
+msgstr "檢測破æçš„å¯åŸ·è¡Œæª”案"
+
+msgid "Detect possibly unwanted apps"
+msgstr "檢測ä¸å—歡迎的軟體"
+
+msgid "Enable verbose logging"
+msgstr "啟用詳細日誌輸出"
+
+msgid "Follow directory symlinks"
+msgstr "跟隨目錄符號連çµ"
+
+msgid "Follow file symlinks"
+msgstr "跟隨檔案符號連çµ"
+
+msgid "Log"
+msgstr "日誌"
+
+msgid "Log additional infection info"
+msgstr "記錄詳細的感染資訊"
+
+msgid "Log time with each message"
+msgstr "記錄訊æ¯æ™‚間戳"
+
+msgid "Max directory scan depth"
+msgstr "最大掃æ深度"
+
+msgid "Max number of threads"
+msgstr "最大執行緒數"
+
+msgid "Max size of log file"
+msgstr "最大日誌大å°"
+
+msgid "Max size of scanned file"
+msgstr "最大å¯æŽƒæ的檔案大å°"
+
+msgid "No"
+msgstr "å¦"
+
+msgid "Port range, highest port"
+msgstr "埠範åœï¼Œæœ€å¤§åŸ "
+
+msgid "Port range, lowest port"
+msgstr "埠範åœï¼Œæœ€å°åŸ "
+
+msgid "Scan ELF files"
+msgstr "掃æ ELF 檔案"
+
+msgid "Scan MS Office and .msi files"
+msgstr "掃æ MS Office 文件和 .msi 安è£åŒ…檔案"
+
+msgid "Scan RFC1341 messages split over many emails"
+msgstr "掃æç¬¦åˆ RFC1341 郵件分離è¦ç¯„的郵件"
+
+msgid "Scan archives"
+msgstr "掃æ歸檔檔案"
+
+msgid "Scan emails"
+msgstr "掃æé›»å­éƒµä»¶"
+
+msgid "Scan pdf files"
+msgstr "掃æ PDF 檔案"
+
+msgid "Scan portable executables"
+msgstr "掃æ PE (Windows) å¯åŸ·è¡Œæª”案"
+
+msgid "Scan swf files"
+msgstr "掃æ SWF 檔案"
+
+msgid "Settings"
+msgstr "設定"
+
+msgid "Yes"
+msgstr "是"
diff --git a/applications/luci-app-commands/po/zh-cn/commands.po b/applications/luci-app-commands/po/zh-cn/commands.po
index 90f1dbed2b..dfddcb3768 100644
--- a/applications/luci-app-commands/po/zh-cn/commands.po
+++ b/applications/luci-app-commands/po/zh-cn/commands.po
@@ -1,15 +1,18 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"PO-Revision-Date: 2017-01-21 09:34+0900\n"
-"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 17:23+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Gtranslator 2.91.7\n"
"POT-Creation-Date: \n"
msgid "A short textual description of the configured command"
@@ -18,7 +21,7 @@ msgstr "简短æ述命令用途"
msgid ""
"Allow executing the command and downloading its output without prior "
"authentication"
-msgstr "å…许在ä¸è®¤è¯çš„å‰æ下执行命令,并获å–其输出。"
+msgstr "å…许直接执行命令并获å–其输出,无须事先验è¯ã€‚"
msgid "Allow the user to provide additional command line arguments"
msgstr "å…许用户æä¾›é¢å¤–的命令行å‚æ•°"
@@ -27,13 +30,13 @@ msgid "Arguments:"
msgstr "å‚数:"
msgid "Binary data not displayed, download instead."
-msgstr "ä¸æ˜¾ç¤ºäºŒè¿›åˆ¶æ•°æ®ï¼Œä½¿ç”¨ä¸‹è½½æ–¹å¼æ›¿ä»£ã€‚"
+msgstr "二进制数æ®æœªæ˜¾ç¤ºï¼Œä»¥ä¸‹è½½æ›¿ä»£ã€‚"
msgid "Code:"
-msgstr "代ç ï¼š"
+msgstr "状æ€ç ï¼š"
msgid "Collecting data..."
-msgstr "收集数æ®ï¼š"
+msgstr "正在收集数æ®â€¦"
msgid "Command"
msgstr "命令"
@@ -90,7 +93,7 @@ msgid "Or display result"
msgstr "显示执行结果"
msgid "Public access"
-msgstr "公共访问"
+msgstr "公开访问"
msgid "Run"
msgstr "è¿è¡Œ"
@@ -104,10 +107,10 @@ msgstr "标准输出æµ"
msgid ""
"This page allows you to configure custom shell commands which can be easily "
"invoked from the web interface."
-msgstr "此页é¢å…许您é…置自定义Shell命令,并å¯ä»¥ä»ŽWebç•Œé¢è°ƒç”¨shell命令。"
+msgstr "此页é¢å…许您é…置自定义 Shell 命令,并å¯ä»¥ä»Ž Web ç•Œé¢è°ƒç”¨ã€‚"
msgid "Waiting for command to complete..."
-msgstr "等待命令执行完æˆ... ..."
+msgstr "正在等待命令完æˆâ€¦"
#~ msgid "Command exited with status code "
#~ msgstr "命令退出,状æ€ç ï¼š"
diff --git a/applications/luci-app-commands/po/zh-tw/commands.po b/applications/luci-app-commands/po/zh-tw/commands.po
index 157c07695f..657e50586a 100644
--- a/applications/luci-app-commands/po/zh-tw/commands.po
+++ b/applications/luci-app-commands/po/zh-tw/commands.po
@@ -1,62 +1,67 @@
+#
+# omnistack <omnistack@gmail.com>, 2014
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-18 19:59+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: 2018-08-07 17:24+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"POT-Creation-Date: \n"
msgid "A short textual description of the configured command"
-msgstr "以短文æ述設定指令"
+msgstr "簡短æ述指令用途"
msgid ""
"Allow executing the command and downloading its output without prior "
"authentication"
-msgstr "å…許執行這指令åŠä¸‹è¼‰å®ƒçš„輸出無須事先驗證"
+msgstr "å…許直接執行指令並ç²å–其輸出,無須事先驗證。"
msgid "Allow the user to provide additional command line arguments"
-msgstr "å…許用戶æä¾›é¡å¤–的指令行åƒæ•¸"
+msgstr "å…許使用者æä¾›é¡å¤–的指令列引數"
msgid "Arguments:"
-msgstr "åƒæ•¸:"
+msgstr "引數:"
msgid "Binary data not displayed, download instead."
-msgstr "二進進資料未顯示, 以下載替代."
+msgstr "二進ä½è³‡æ–™æœªé¡¯ç¤ºï¼Œä»¥ä¸‹è¼‰æ›¿ä»£ã€‚"
msgid "Code:"
-msgstr "碼:"
+msgstr "狀態碼:"
msgid "Collecting data..."
-msgstr "收集資料中..."
+msgstr "正在收集資料…"
msgid "Command"
msgstr "指令"
msgid "Command executed successfully."
-msgstr ""
+msgstr "指令æˆåŠŸåŸ·è¡Œã€‚"
msgid "Command exited with status code"
-msgstr ""
+msgstr "指令退出,狀態碼:"
msgid "Command failed"
-msgstr "命令失敗"
+msgstr "執行指令失敗"
msgid "Command line to execute"
-msgstr "è¦åŸ·è¡Œçš„指令行"
+msgstr "執行指令列"
msgid "Command successful"
-msgstr "命令æˆåŠŸ"
+msgstr "執行指令æˆåŠŸ"
msgid "Command:"
-msgstr "命令:"
+msgstr "指令:"
msgid "Configure"
-msgstr "設定"
+msgstr "é…ç½®"
msgid "Custom Commands"
msgstr "自訂指令集"
@@ -74,39 +79,39 @@ msgid "Download"
msgstr "下載"
msgid "Download execution result"
-msgstr ""
+msgstr "下載執行çµæžœ"
msgid "Failed to execute command!"
-msgstr "執行指令失敗!"
+msgstr "執行指令失敗ï¼"
msgid "Link"
-msgstr "連çµ"
+msgstr "連線"
msgid "Loading"
-msgstr "掛載"
+msgstr "載入中"
msgid "Or display result"
-msgstr ""
+msgstr "顯示執行çµæžœ"
msgid "Public access"
-msgstr "公用存å–"
+msgstr "公開訪å•"
msgid "Run"
msgstr "執行"
msgid "Standard Error"
-msgstr ""
+msgstr "標準錯誤æµ"
msgid "Standard Output"
-msgstr ""
+msgstr "標準輸出æµ"
msgid ""
"This page allows you to configure custom shell commands which can be easily "
"invoked from the web interface."
-msgstr "åªè¦å¯ä»¥å¾žweb介輕易調用, 這é é¢å…許您自定shell指令."
+msgstr "æ­¤é é¢å…許您é…置自訂 Shell 指令,並å¯ä»¥å¾ž Web 介é¢å‘¼å«ã€‚"
msgid "Waiting for command to complete..."
-msgstr "等待完整命令中..."
+msgstr "正在等待指令完æˆâ€¦"
-#~ msgid "Access command with"
-#~ msgstr "å­˜å–指令"
+#~ msgid "Command exited with status code "
+#~ msgstr "指令退出,狀態碼:"
diff --git a/applications/luci-app-coovachilli/po/zh-cn/coovachilli.po b/applications/luci-app-coovachilli/po/zh-cn/coovachilli.po
index 7ab003293d..1c5f94027e 100644
--- a/applications/luci-app-coovachilli/po/zh-cn/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/zh-cn/coovachilli.po
@@ -1,17 +1,19 @@
# coovachilli.pot
# generated from ./applications/luci-coovachilli/luasrc/i18n/coovachilli.en.lua
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-09-05 14:32+0200\n"
-"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 17:38+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "CoovaChilli"
msgstr "CoovaChilli 网页认è¯"
@@ -20,7 +22,7 @@ msgid "Network Configuration"
msgstr "网络é…ç½®"
msgid "RADIUS configuration"
-msgstr "RADIUSé…ç½®"
+msgstr "RADIUS é…ç½®"
msgid "UAM and MAC Authentication"
-msgstr "UAMå’ŒMAC认è¯"
+msgstr "UAM å’Œ MAC 认è¯"
diff --git a/applications/luci-app-coovachilli/po/zh-tw/coovachilli.po b/applications/luci-app-coovachilli/po/zh-tw/coovachilli.po
index aad8a4d7a6..5a49115613 100644
--- a/applications/luci-app-coovachilli/po/zh-tw/coovachilli.po
+++ b/applications/luci-app-coovachilli/po/zh-tw/coovachilli.po
@@ -1,24 +1,27 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-18 19:49+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 17:38+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "CoovaChilli"
-msgstr "CoovaChilliæœå‹™"
+msgstr "CoovaChilli æœå‹™"
msgid "Network Configuration"
msgstr "網路設定"
msgid "RADIUS configuration"
-msgstr "RADIUS設定"
+msgstr "RADIUS 設定"
msgid "UAM and MAC Authentication"
-msgstr "微軟UAM模組和MACä½æŒ‡é©—è­‰"
+msgstr "微軟 UAM 模組和 MAC ä½æŒ‡é©—è­‰"
diff --git a/applications/luci-app-ddns/Makefile b/applications/luci-app-ddns/Makefile
index 7295189518..195e08131b 100644
--- a/applications/luci-app-ddns/Makefile
+++ b/applications/luci-app-ddns/Makefile
@@ -19,8 +19,7 @@ PKG_VERSION:=2.4.9
PKG_RELEASE:=5
PKG_LICENSE:=Apache-2.0
-PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>, \
- Ansuel Smith <ansuelsmth@gmail.com>
+PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
# LuCI specific settings
LUCI_TITLE:=LuCI Support for Dynamic DNS Client (ddns-scripts)
diff --git a/applications/luci-app-ddns/luasrc/tools/ddns.lua b/applications/luci-app-ddns/luasrc/tools/ddns.lua
index 57913a51fe..6f0c7f0952 100755
--- a/applications/luci-app-ddns/luasrc/tools/ddns.lua
+++ b/applications/luci-app-ddns/luasrc/tools/ddns.lua
@@ -10,121 +10,120 @@ local SYS = require "luci.sys"
function env_info(type)
- if ( type == "has_ssl" ) or ( type == "has_proxy" ) or ( type == "has_forceip" )
- or ( type == "has_bindnet" ) or ( type == "has_fetch" )
- or ( type == "has_wgetssl" ) or ( type == "has_curl" )
- or ( type == "has_curlssl" ) or ( type == "has_curlpxy" )
- or ( type == "has_fetchssl" ) or ( type == "has_bbwget" ) then
-
- local function has_wgetssl()
+ if ( type == "has_ssl" ) or ( type == "has_proxy" ) or ( type == "has_forceip" )
+ or ( type == "has_bindnet" ) or ( type == "has_fetch" )
+ or ( type == "has_wgetssl" ) or ( type == "has_curl" )
+ or ( type == "has_curlssl" ) or ( type == "has_curlpxy" )
+ or ( type == "has_fetchssl" ) or ( type == "has_bbwget" ) then
+
+ local function has_wgetssl()
return (SYS.call( [[which wget-ssl >/dev/null 2>&1]] ) == 0) -- and true or nil
end
-
- local function has_curlssl()
+
+ local function has_curlssl()
return (SYS.call( [[$(which curl) -V 2>&1 | grep "Protocols:" | grep -qF "https"]] ) ~= 0)
end
-
+
local function has_fetch()
return (SYS.call( [[which uclient-fetch >/dev/null 2>&1]] ) == 0)
end
-
+
local function has_fetchssl()
return NXFS.access("/lib/libustream-ssl.so")
end
-
+
local function has_curl()
return (SYS.call( [[which curl >/dev/null 2>&1]] ) == 0)
end
-
+
local function has_curlpxy()
return (SYS.call( [[grep -i "all_proxy" /usr/lib/libcurl.so* >/dev/null 2>&1]] ) == 0)
end
-
+
local function has_bbwget()
return (SYS.call( [[$(which wget) -V 2>&1 | grep -iqF "busybox"]] ) == 0)
end
-
+
if type == "has_wgetssl" then
return has_wgetssl()
-
+
elseif type == "has_curl" then
return has_curl()
-
+
elseif type == "has_curlssl" then
return has_curlssl()
-
+
elseif type == "has_curlpxy" then
return has_curlpxy()
-
+
elseif type == "has_fetch" then
return has_fetch()
-
+
elseif type == "has_fetchssl" then
return has_fetchssl()
-
+
elseif type == "has_bbwget" then
return has_bbwget()
-
+
elseif type == "has_ssl" then
if has_wgetssl() then return true end
if has_curlssl() then return true end
if (has_fetch() and has_fetchssl()) then return true end
return false
-
+
elseif type == "has_proxy" then
if has_wgetssl() then return true end
if has_curlpxy() then return true end
if has_fetch() then return true end
if has_bbwget() then return true end
return false
-
+
elseif type == "has_forceip" then
if has_wgetssl() then return true end
if has_curl() then return true end
if has_fetch() then return true end -- only really needed for transfer
return false
-
+
elseif type == "has_bindnet" then
if has_curl() then return true end
if has_wgetssl() then return true end
return false
end
-
+
elseif ( type == "has_dnsserver" ) or ( type == "has_bindhost" ) or ( type == "has_hostip" ) or ( type == "has_nslookup" ) then
- local function has_bindhost()
- if (SYS.call( [[which host >/dev/null 2>&1]] ) == 0) then return true end
+ local function has_bindhost()
if (SYS.call( [[which host >/dev/null 2>&1]] ) == 0) then return true end
if (SYS.call( [[which khost >/dev/null 2>&1]] ) == 0) then return true end
if (SYS.call( [[which drill >/dev/null 2>&1]] ) == 0) then return true end
return false
end
-
+
local function has_hostip()
return (SYS.call( [[which hostip >/dev/null 2>&1]] ) == 0)
end
-
+
local function has_nslookup()
return (SYS.call( [[$(which nslookup) localhost 2>&1 | grep -qF "(null)"]] ) ~= 0)
end
-
+
if type == "has_bindhost" then
return has_bindhost()
elseif type == "has_hostip" then
return has_hostip()
elseif type == "has_nslookup" then
return has_nslookup()
- elseif tyep == "has_dnsserver" then
+ elseif type == "has_dnsserver" then
if has_bindhost() then return true end
if has_hostip() then return true end
if has_nslookup() then return true end
return false
end
-
+
elseif type == "has_ipv6" then
return (NXFS.access("/proc/net/ipv6_route") and NXFS.access("/usr/sbin/ip6tables"))
-
+
elseif type == "has_cacerts" then
- --old _check_certs() local function
+ --old _check_certs() local function
local _, v = NXFS.glob("/etc/ssl/certs/*.crt")
if ( v == 0 ) then _, v = NXFS.glob("/etc/ssl/certs/*.pem") end
return (v > 0)
diff --git a/applications/luci-app-ddns/po/ru/ddns.po b/applications/luci-app-ddns/po/ru/ddns.po
index 4731cc379f..415f7badb8 100644
--- a/applications/luci-app-ddns/po/ru/ddns.po
+++ b/applications/luci-app-ddns/po/ru/ddns.po
@@ -56,22 +56,22 @@ msgid ""
"BusyBox's nslookup and Wget do not support to specify the IP version to use "
"for communication with DDNS Provider!"
msgstr ""
-"Утилиты nslookup и wget из ÑоÑтава busybox не поддерживают указание IP-верÑии"
-", иÑпользуемой Ð´Ð»Ñ ÑвÑзи Ñ DDNS провайдером!"
+"Утилиты nslookup и wget из ÑоÑтава busybox не поддерживают указание IP-"
+"верÑии, иÑпользуемой Ð´Ð»Ñ ÑвÑзи Ñ DDNS провайдером!"
msgid ""
"BusyBox's nslookup and hostip do not support to specify to use TCP instead "
"of default UDP when requesting DNS server!"
msgstr ""
-"Утилиты nslookup и hostip из ÑоÑтава busybox не поддерживают указание иÑпольз"
-"овать TCP вмеÑто UDP по умолчанию при запроÑе DNS Ñервера!"
+"Утилиты nslookup и hostip из ÑоÑтава busybox не поддерживают указание "
+"иÑпользовать TCP вмеÑто UDP по умолчанию при запроÑе DNS Ñервера!"
msgid ""
"BusyBox's nslookup in the current compiled version does not handle given DNS "
"Servers correctly!"
msgstr ""
-"Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ Ñкомпилированной верÑии busybox, утилита nslookup не обраба"
-"тывает данные DNS Ñервера правильно!"
+"Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ¹ Ñкомпилированной верÑии busybox, утилита nslookup не "
+"обрабатывает данные DNS Ñервера правильно!"
msgid "Casual users should not change this setting"
msgstr "Обычный пользователь не должен изменÑÑ‚ÑŒ данную опцию"
@@ -116,8 +116,8 @@ msgid ""
">You can start/stop each configuration here. It will run until next reboot."
msgstr ""
"Ð’ наÑтоÑщее времÑ, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ DDNS не запуÑкаютÑÑ Ð¿Ñ€Ð¸ загрузке или при "
-"ÑобытиÑÑ… интерфейÑа.<br />Ð’Ñ‹ можете запуÑтить/оÑтановить каждый "
-"config здеÑÑŒ. Он будет работать до Ñледующей перезагрузки."
+"ÑобытиÑÑ… интерфейÑа.<br />Ð’Ñ‹ можете запуÑтить/оÑтановить каждый config "
+"здеÑÑŒ. Он будет работать до Ñледующей перезагрузки."
msgid "Custom update script to be used for updating your DDNS Provider."
msgstr ""
@@ -310,9 +310,9 @@ msgid ""
"the instructions on OpenWrt's homepage to enable IPv6 support<br />or update "
"your system to the latest OpenWrt Release"
msgstr ""
-"IPv6 не поддерживаетÑÑ Ð²Ð°ÑˆÐµÐ¹ прошивкой.<br />Следуйте инÑтрукциÑм на "
-"главной Ñтранице OpenWrt, чтобы включить поддержку IPv6<br / >или обновить "
-"прошивку до поÑледнего выпуÑка OpenWrt Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ð¾Ð¹ поддержкой IPv6"
+"IPv6 не поддерживаетÑÑ Ð²Ð°ÑˆÐµÐ¹ прошивкой.<br />Следуйте инÑтрукциÑм на главной "
+"Ñтранице OpenWrt, чтобы включить поддержку IPv6<br / >или обновить прошивку "
+"до поÑледнего выпуÑка OpenWrt Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ð¾Ð¹ поддержкой IPv6"
msgid "IPv6 not supported"
msgstr "IPv6 не поддерживаетÑÑ"
@@ -322,8 +322,7 @@ msgstr "IPv6-адреÑ"
msgid "If both cURL and GNU Wget are installed, Wget is used by default."
msgstr ""
-"ЕÑли уÑтановлены и cURL и GNU wget, по умолчанию будет иÑпользоватьÑÑ "
-"wget."
+"ЕÑли уÑтановлены и cURL и GNU wget, по умолчанию будет иÑпользоватьÑÑ wget."
msgid ""
"If this service section is disabled it could not be started.<br />Neither "
@@ -381,8 +380,7 @@ msgstr ""
msgid "It is NOT recommended for casual users to change settings on this page."
msgstr ""
-"ÐаÑтройки на данной Ñтранице не рекомендуетÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ обычным "
-"пользователÑм."
+"ÐаÑтройки на данной Ñтранице не рекомендуетÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ обычным пользователÑм."
msgid "Last Update"
msgstr "ПоÑледнее обновление"
@@ -414,8 +412,9 @@ msgstr "Ðе уÑтановлено"
msgid ""
"Neither GNU Wget with SSL nor cURL installed to select a network to use for "
"communication."
-msgstr "Ðе уÑтановлены пакеты GNU wget c SSL или cURL Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти выбора "
-"Ñети Ð´Ð»Ñ ÑвÑзи."
+msgstr ""
+"Ðе уÑтановлены пакеты GNU wget c SSL или cURL Ð´Ð»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾Ñти выбора Ñети "
+"Ð´Ð»Ñ ÑвÑзи."
msgid ""
"Neither GNU Wget with SSL nor cURL installed to support secure updates via "
@@ -459,8 +458,8 @@ msgstr "ÐеобÑзательно: иÑпользовать только чиÑ
msgid "OPTIONAL: Force the use of TCP instead of default UDP on DNS requests."
msgstr ""
-"ÐеобÑзательно: иÑпользовать протокол TCP вмеÑто UDP по умолчанию "
-"Ð´Ð»Ñ DNS-запроÑов."
+"ÐеобÑзательно: иÑпользовать протокол TCP вмеÑто UDP по умолчанию Ð´Ð»Ñ DNS-"
+"запроÑов."
msgid "OPTIONAL: Network to use for communication"
msgstr "ÐеобÑзательно: Ñеть Ð´Ð»Ñ ÑвÑзи"
@@ -470,8 +469,8 @@ msgstr "ÐеобÑзательно: прокÑи-Ñервер Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€Ñ
msgid "OPTIONAL: Use non-default DNS-Server to detect 'Registered IP'."
msgstr ""
-"ÐеобÑзательно: иÑпользовать DNS Ñервер не иÑпользуемый по умолчанию, "
-"Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ 'ЗарегиÑтрированного IP-адреÑа'."
+"ÐеобÑзательно: иÑпользовать DNS Ñервер не иÑпользуемый по умолчанию, Ð´Ð»Ñ "
+"Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ 'ЗарегиÑтрированного IP-адреÑа'."
msgid "On Error the script will retry the failed action after given time"
msgstr ""
@@ -496,8 +495,7 @@ msgid "Optional: Replaces [PARAMENC] in Update-URL (URL-encoded)"
msgstr "ÐеобÑзательно: заменÑет [PARAMENC] в Update-URL (URL-encoded)"
msgid "Optional: Replaces [PARAMOPT] in Update-URL (NOT URL-encoded)"
-msgstr ""
-"ÐеобÑзательно: заменÑет [PARAMOPT] в Update-URL (не URL-encoded)"
+msgstr "ÐеобÑзательно: заменÑет [PARAMOPT] в Update-URL (не URL-encoded)"
msgid "Overview"
msgstr "Обзор"
@@ -605,8 +603,8 @@ msgid ""
"Update URL to be used for updating your DDNS Provider.<br />Follow "
"instructions you will find on their WEB page."
msgstr ""
-"URL Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ DDNS-провайдера.<br />Следуйте "
-"инÑтрукциÑм, которые вы найдете на их на веб-Ñтранице."
+"URL Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ÑпользуетÑÑ Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ DDNS-провайдера.<br /"
+">Следуйте инÑтрукциÑм, которые вы найдете на их на веб-Ñтранице."
msgid "Update error"
msgstr "Ошибка обновлениÑ"
@@ -658,14 +656,15 @@ msgid ""
"You should install 'bind-host' or 'knot-host' or 'drill' or 'hostip' "
"package, if you need to specify a DNS server to detect your registered IP."
msgstr ""
-"УÑтановите пакет 'bind-host', 'knot-host', 'drill' или 'hostip' еÑли "
-"вам нужно указать DNS Ñервер Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ зарегиÑтрированного IP-"
+"УÑтановите пакет 'bind-host', 'knot-host', 'drill' или 'hostip' еÑли вам "
+"нужно указать DNS Ñервер Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ зарегиÑтрированного IP-"
"адреÑа."
msgid ""
"You should install 'bind-host' or 'knot-host' or 'drill' package for DNS "
"requests."
-msgstr "УÑтановите пакет 'bind-host', 'knot-host' или 'drill' Ð´Ð»Ñ DNS запроÑов."
+msgstr ""
+"УÑтановите пакет 'bind-host', 'knot-host' или 'drill' Ð´Ð»Ñ DNS запроÑов."
msgid "You should install 'wget' or 'curl' or 'uclient-fetch' package."
msgstr "УÑтановите пакет 'wget', 'curl' или 'uclient-fetch'."
@@ -757,8 +756,7 @@ msgid "no data"
msgstr "нет данных"
msgid "not found or not executable - Sample: '/path/to/script.sh'"
-msgstr ""
-"Ðе найден или не ÑвлÑетÑÑ Ð¸ÑполнÑемым — пример: '/path/to/script.sh'"
+msgstr "Ðе найден или не ÑвлÑетÑÑ Ð¸ÑполнÑемым — пример: '/path/to/script.sh'"
msgid "nslookup can not resolve host"
msgstr "Утилита nslookup не может разрешить хоÑÑ‚"
diff --git a/applications/luci-app-ddns/po/zh-cn/ddns.po b/applications/luci-app-ddns/po/zh-cn/ddns.po
index f004f8282f..3d8b551403 100644
--- a/applications/luci-app-ddns/po/zh-cn/ddns.po
+++ b/applications/luci-app-ddns/po/zh-cn/ddns.po
@@ -1,11 +1,11 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: luci-app-ddns 2.4.0-1\n"
"POT-Creation-Date: 2016-01-30 11:07+0100\n"
-"PO-Revision-Date: 2017-10-29 14:14+0800\n"
+"PO-Revision-Date: 2018-08-08 08:38+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgid "Check Interval"
msgstr "检查时间周期"
msgid "Collecting data..."
-msgstr "正在收集数æ®..."
+msgstr "正在收集数æ®â€¦"
msgid "Config error"
msgstr "é…置错误"
@@ -532,7 +532,7 @@ msgstr "å·²åœæ­¢"
msgid ""
"The currently installed 'ddns-scripts' package did not support all available "
"settings."
-msgstr "当å‰å·²å®‰è£…çš„'ddns-scripts'软件包暂ä¸æ”¯æŒæ‰€æœ‰å¯ç”¨è®¾ç½®é¡¹"
+msgstr "当å‰å·²å®‰è£…的“ddns-scriptsâ€è½¯ä»¶åŒ…ä¸æ”¯æŒæ‰€æœ‰å¯ç”¨è®¾ç½®é¡¹ã€‚"
msgid "The default setting of '0' will retry infinite."
msgstr "默认设置“0â€å°†æ— é™é‡è¯•ã€‚"
@@ -593,7 +593,7 @@ msgid "Version Information"
msgstr "版本信æ¯"
msgid "Waiting for changes to be applied..."
-msgstr "正在应用更改..."
+msgstr "正在应用更改…"
msgid "Warning"
msgstr "等待"
diff --git a/applications/luci-app-ddns/po/zh-tw/ddns.po b/applications/luci-app-ddns/po/zh-tw/ddns.po
index f378b39738..fdb1070c2e 100644
--- a/applications/luci-app-ddns/po/zh-tw/ddns.po
+++ b/applications/luci-app-ddns/po/zh-tw/ddns.po
@@ -1,11 +1,11 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: luci-app-ddns 2.4.0-1\n"
"POT-Creation-Date: 2016-01-30 11:07+0100\n"
-"PO-Revision-Date: 2017-10-29 14:14+0800\n"
+"PO-Revision-Date: 2018-08-08 08:38+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language: zh_TW\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgid "&"
msgstr "&"
msgid "-- custom --"
-msgstr "-- 自定義 --"
+msgstr "-- 自訂 --"
msgid "-- default --"
msgstr "-- é è¨­ --"
@@ -80,7 +80,7 @@ msgid "Check Interval"
msgstr "檢查時間週期"
msgid "Collecting data..."
-msgstr "正在收集資料..."
+msgstr "正在收集資料…"
msgid "Config error"
msgstr "é…置錯誤"
@@ -115,13 +115,13 @@ msgstr ""
"一個設定的æ¢ç›®ã€‚它在下次é‡å•Ÿä¹‹å‰ä¸€ç›´æœ‰æ•ˆã€‚"
msgid "Custom update script to be used for updating your DDNS Provider."
-msgstr "用來更新動態 DNS 的自定義指令碼。"
+msgstr "用來更新動態 DNS 的自訂指令碼。"
msgid "Custom update-URL"
-msgstr "自定義更新 URL"
+msgstr "自訂更新 URL"
msgid "Custom update-script"
-msgstr "自定義更新指令碼"
+msgstr "自訂更新指令碼"
msgid "DDNS Autostart disabled"
msgstr "DDNS 自動啟動已ç¦ç”¨ã€‚"
@@ -532,7 +532,7 @@ msgstr "å·²åœæ­¢"
msgid ""
"The currently installed 'ddns-scripts' package did not support all available "
"settings."
-msgstr "當å‰å·²å®‰è£çš„'ddns-scripts'軟體包暫ä¸æ”¯æ´æ‰€æœ‰å¯ç”¨è¨­å®šé …"
+msgstr "當å‰å·²å®‰è£çš„“ddns-scriptsâ€è»Ÿé«”包ä¸æ”¯æ´æ‰€æœ‰å¯ç”¨è¨­å®šé …。"
msgid "The default setting of '0' will retry infinite."
msgstr "é è¨­è¨­å®šâ€œ0â€å°‡ç„¡é™é‡è©¦ã€‚"
@@ -593,7 +593,7 @@ msgid "Version Information"
msgstr "版本資訊"
msgid "Waiting for changes to be applied..."
-msgstr "正在應用更改..."
+msgstr "正在應用更改…"
msgid "Warning"
msgstr "等待"
diff --git a/applications/luci-app-diag-core/po/zh-cn/diag_core.po b/applications/luci-app-diag-core/po/zh-cn/diag_core.po
index e857d3d828..69e7af5bea 100644
--- a/applications/luci-app-diag-core/po/zh-cn/diag_core.po
+++ b/applications/luci-app-diag-core/po/zh-cn/diag_core.po
@@ -1,18 +1,21 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-09-05 14:39+0200\n"
-"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 17:39+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Configure Diagnostics"
-msgstr "é…置诊断"
+msgstr "诊断é…ç½®"
msgid "Diagnostics"
msgstr "诊断"
@@ -30,7 +33,7 @@ msgstr "下é¢çš„æ¡ç›®å¯ä»¥è¯Šæ–­æµ‹è¯•ç³»ç»Ÿï¼Œä¸ºæŽ’除故障æ供信æ¯"
msgid ""
"With this menu you can configure network diagnostics, such as network device "
"scans and ping tests."
-msgstr "在这里å¯ä»¥é…置网络诊断,例如:扫æ网络设备,进行ping测试等。"
+msgstr "在这里å¯ä»¥é…置网络诊断,例如扫æ网络设备,或进行 ping 测试。"
#~ msgid "l_d_diag"
#~ msgstr "l_d诊断"
diff --git a/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po b/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po
new file mode 100644
index 0000000000..1b830f11e7
--- /dev/null
+++ b/applications/luci-app-dnscrypt-proxy/po/zh-cn/dnscrypt-proxy.po
@@ -0,0 +1,255 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 18:40+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "-------"
+msgstr "-------"
+
+msgid "Advanced"
+msgstr "高级"
+
+msgid "Alternate Resolver List"
+msgstr "备用解æžæœåŠ¡å™¨åˆ—表"
+
+msgid ""
+"Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
+msgstr "将特定于 DNSCrypt-Proxy 的设置应用到 Dnsmasq é…置。<br />"
+
+msgid "Blacklist"
+msgstr "黑åå•"
+
+msgid "Block IPv6"
+msgstr "阻止 IPv6"
+
+msgid ""
+"By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
+"'All' available network interfaces.<br />"
+msgstr ""
+"默认情况下,DNSCrypt-Proxy å¯åŠ¨å°†ç”±â€œAllâ€æ‰€æœ‰å¯ç”¨ç½‘络接å£çš„ ifup 事件触å‘。"
+"<br />"
+
+msgid "Configuration of the DNSCrypt-Proxy package."
+msgstr "é…ç½® DNSCrypt-Proxy 包。"
+
+msgid ""
+"Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
+"upstream timeouts with multiple DNSCrypt instances.<br />"
+msgstr ""
+"创建“/etc/resolv-crypt.confâ€æ—¶ä½¿ç”¨â€œoptions timeout:1â€é€‰é¡¹ï¼Œç”¨å¤šä¸ª DNSCrypt 实"
+"例æ¥å‡å°‘ DNS 上游å‘生超时的情况。<br />"
+
+msgid "Create Config File"
+msgstr "创建é…置文件"
+
+msgid "Create Custom Config File"
+msgstr "创建自定义é…置文件"
+
+msgid "DNS Query Logfile"
+msgstr "DNS 查询日志文件"
+
+msgid "DNSCrypt-Proxy"
+msgstr "DNSCrypt-Proxy"
+
+msgid "DNSCrypt-Proxy Logfile"
+msgstr "DNSCrypt-Proxy 日志文件"
+
+msgid "DNSCrypt-Proxy Resolver List"
+msgstr "DNSCrypt-Proxy 解æžæœåŠ¡å™¨åˆ—表"
+
+msgid "Default Resolver List"
+msgstr "默认解æžæœåŠ¡å™¨åˆ—表"
+
+msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
+msgstr "ç¦ç”¨ IPv6 以加速 DNSCrypt-Proxy。"
+
+msgid "Dnsmasq Options"
+msgstr "Dnsmasq 选项"
+
+msgid ""
+"Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
+msgstr "从“github.com/dyne/DNSCrypt-Proxyâ€ä¸‹è½½å½“å‰çš„解æžæœåŠ¡å™¨åˆ—表。"
+
+msgid "Edit DNSCrypt-Proxy Configuration"
+msgstr "编辑 DNSCrypt-Proxy é…ç½®"
+
+msgid "Edit Dnsmasq Configuration"
+msgstr "编辑 Dnsmasq é…ç½®"
+
+msgid "Edit Resolvcrypt Configuration"
+msgstr "编辑 Resolvcrypt é…ç½®"
+
+msgid "Enable Caching to speed up DNSCcrypt-Proxy."
+msgstr "å¯ç”¨ç¼“存以加速 DNSCcrypt-Proxy。"
+
+msgid "Ephemeral Keys"
+msgstr "临时密钥"
+
+msgid "File Checksum"
+msgstr "文件校验和"
+
+msgid "File Date"
+msgstr "文件日期"
+
+msgid ""
+"For further information <a href=\"%s\" target=\"_blank\">see the wiki "
+"online</a>"
+msgstr "详细信æ¯è¯·<a href=\"%s\" target=\"_blank\">查看在线 wiki</a>"
+
+msgid "General Options"
+msgstr "常规选项"
+
+msgid "IP Address"
+msgstr "IP 地å€"
+
+msgid "Improve privacy by using an ephemeral public key for each query."
+msgstr "æ¯æ¬¡æŸ¥è¯¢ä½¿ç”¨ä¸åŒçš„临时公钥,以增强éšç§ã€‚"
+
+msgid "Input file not found, please check your configuration."
+msgstr "未找到输入文件,请检查您的é…置。"
+
+msgid "Instance Options"
+msgstr "实例选项"
+
+msgid "Local Cache"
+msgstr "本地缓存"
+
+msgid ""
+"Local blacklists allow you to block abuse sites by domains or ip addresses."
+msgstr "本地黑åå•ï¼Œå…许您按域å或 IP 地å€æ‹¦æˆªæœ‰å®³ç½‘站。"
+
+msgid ""
+"Log the received DNS queries to a file, so you can watch in real-time what "
+"is happening on the network."
+msgstr "将收到的 DNS 查询记录到文件中,以便您å¯ä»¥å®žæ—¶æŸ¥çœ‹ç½‘络上å‘生的情况。"
+
+msgid ""
+"Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
+"and NOLOG-Flag."
+msgstr "ç”¨äºŽè§£æž DNS 查询的远程æœåŠ¡å™¨å称,包括ä½ç½®ã€DNSSEC- å’Œ NOLOG-Flag。"
+
+msgid "No SSL support available.<br />"
+msgstr "æ—  SSL 支æŒã€‚<br />"
+
+msgid "No default resolver list and no SSL support available.<br />"
+msgstr "无默认解æžæœåŠ¡å™¨åˆ—表,也无 SSL 支æŒã€‚<br />"
+
+msgid "Overview"
+msgstr "概述"
+
+msgid "Please edit the file manually in the 'Advanced' section."
+msgstr "请在“高级â€éƒ¨åˆ†ä¸­æ‰‹åŠ¨ç¼–辑文件。"
+
+msgid ""
+"Please install a 'libustream-ssl' library to download the current resolver "
+"list from 'github.com/dyne/dnscrypt-proxy'."
+msgstr ""
+"è¦ä»Žâ€œgithub.com/dyne/DNSCrypt-Proxyâ€ä¸‹è½½å½“å‰çš„解æžæœåŠ¡å™¨åˆ—表,请安"
+"装“libustream-sslâ€åº“。"
+
+msgid ""
+"Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
+"resolvers.csv' to use this package."
+msgstr ""
+"è¦ä½¿ç”¨æ­¤ç¨‹åºï¼Œè¯·å°†è§£æžæœåŠ¡å™¨åˆ—表放到“/usr/share/DNSCrypt-Proxy/dnscrypt-"
+"resolvers.csvâ€ã€‚"
+
+msgid ""
+"Please note: This may change the values for 'noresolv', 'resolvfile', "
+"'allservers' and the list 'server' settings."
+msgstr ""
+"请注æ„:这å¯èƒ½ä¼šæ›´æ”¹â€œnoresolvâ€ã€â€œresolvfileâ€ã€â€œallserversâ€å’Œâ€œserverâ€åˆ—表的设"
+"置值。"
+
+msgid "Port"
+msgstr "端å£"
+
+msgid "Refresh List"
+msgstr "刷新列表"
+
+msgid "Refresh Resolver List"
+msgstr "刷新解æžæœåŠ¡å™¨åˆ—表"
+
+msgid "Resolver (LOC/SEC/NOLOG)"
+msgstr "解æžæœåŠ¡å™¨ï¼ˆLOC/SEC/NOLOG)"
+
+msgid "Save"
+msgstr "ä¿å­˜"
+
+msgid "Specify a non-default Resolver List."
+msgstr "指定éžé»˜è®¤çš„解æžæœåŠ¡å™¨åˆ—表。"
+
+msgid "Startup Trigger"
+msgstr "å¯åŠ¨è§¦å‘器"
+
+msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
+msgstr "é…置文件“/etc/resolv-crypt.confâ€å·²ç»å­˜åœ¨ã€‚<br />"
+
+msgid "The listening port for DNS queries."
+msgstr "DNS 查询的监å¬ç«¯å£ã€‚"
+
+msgid ""
+"The local IPv4 or IPv6 address. The latter one should be specified within "
+"brackets, e.g. '[::1]'."
+msgstr "本地 IPv4 或 IPv6 地å€ã€‚åŽè€…应用方括å·æ‹¬èµ·ï¼Œå¦‚“[::1]â€ã€‚"
+
+msgid ""
+"The value for this property is the blocklist type and path to the file, e."
+"g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
+msgstr ""
+"此属性的值是拦截列表的类型和文件的路径,例如“domains:/path/to/dbl."
+"txtâ€æˆ–“ips:/path/to/ipbl.txtâ€ã€‚"
+
+msgid ""
+"This form allows you to modify the content of the main DNSCrypt-Proxy "
+"configuration file (/etc/config/dnscrypt-proxy)."
+msgstr ""
+"此表å•å…许您修改主 DNSCrypt-Proxy é…置文件(/etc/config/dnscrypt-proxy)的内"
+"容。"
+
+msgid ""
+"This form allows you to modify the content of the main Dnsmasq configuration "
+"file (/etc/config/dhcp)."
+msgstr "此表å•å…许您修改主 Dnsmasq é…置文件(/etc/config/dhcp)的内容。"
+
+msgid ""
+"This form allows you to modify the content of the resolv-crypt configuration "
+"file (/etc/resolv-crypt.conf)."
+msgstr ""
+"此表å•å…许您修改 resolv-crypt é…置文件(/etc/resolv-crypt.conf)的内容。"
+
+msgid "This form shows the content of the current DNSCrypt Resolver List."
+msgstr "此表å•æ˜¾ç¤ºå½“å‰ DNSCrypt 的解æžæœåŠ¡å™¨åˆ—表。"
+
+msgid ""
+"This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
+"messages only."
+msgstr "此表å•æ˜¾ç¤º syslog 输出,仅针对 DNSCrypt-Proxy 相关消æ¯è¿›è¡Œé¢„过滤。"
+
+msgid ""
+"This option requires extra CPU cycles and is useless with most DNSCrypt "
+"server."
+msgstr "此选项需è¦é¢å¤–çš„ CPU 周期,对大多数 DNSCrypt æœåŠ¡å™¨éƒ½æ²¡ç”¨ã€‚"
+
+msgid ""
+"To restrict the trigger, select only the relevant network interface. Usually "
+"the 'wan' interface should work for most users."
+msgstr ""
+"è¦é™åˆ¶è§¦å‘器,请åªé€‰æ‹©ç›¸å…³çš„网络接å£ã€‚通常,“wanâ€æŽ¥å£åº”该适用于大多数用户。"
+
+msgid "Transfer Options To Dnsmasq"
+msgstr "转移选项到 Dnsmasq "
+
+msgid "View Logfile"
+msgstr "查看日志文件"
+
+msgid "View Resolver List"
+msgstr "查看解æžæœåŠ¡å™¨åˆ—表"
diff --git a/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po b/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po
new file mode 100644
index 0000000000..032444d729
--- /dev/null
+++ b/applications/luci-app-dnscrypt-proxy/po/zh-tw/dnscrypt-proxy.po
@@ -0,0 +1,255 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 18:40+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "-------"
+msgstr "-------"
+
+msgid "Advanced"
+msgstr "高階"
+
+msgid "Alternate Resolver List"
+msgstr "備用解æžä¼ºæœå™¨åˆ—表"
+
+msgid ""
+"Apply DNSCrypt-Proxy specific settings to the Dnsmasq configuration.<br />"
+msgstr "將特定於 DNSCrypt-Proxy 的設定應用到 Dnsmasq é…置。<br />"
+
+msgid "Blacklist"
+msgstr "黑åå–®"
+
+msgid "Block IPv6"
+msgstr "阻止 IPv6"
+
+msgid ""
+"By default the DNSCrypt-Proxy startup will be triggered by ifup events of "
+"'All' available network interfaces.<br />"
+msgstr ""
+"é è¨­æƒ…æ³ä¸‹ï¼ŒDNSCrypt-Proxy 啟動將由“Allâ€æ‰€æœ‰å¯ç”¨ç¶²è·¯ä»‹é¢çš„ ifup 事件觸發。"
+"<br />"
+
+msgid "Configuration of the DNSCrypt-Proxy package."
+msgstr "é…ç½® DNSCrypt-Proxy 包。"
+
+msgid ""
+"Create '/etc/resolv-crypt.conf' with 'options timeout:1' to reduce DNS "
+"upstream timeouts with multiple DNSCrypt instances.<br />"
+msgstr ""
+"建立“/etc/resolv-crypt.confâ€æ™‚使用“options timeout:1â€é¸é …,用多個 DNSCrypt 實"
+"例來減少 DNS 上游發生超時的情æ³ã€‚<br />"
+
+msgid "Create Config File"
+msgstr "建立é…置檔案"
+
+msgid "Create Custom Config File"
+msgstr "建立自訂é…置檔案"
+
+msgid "DNS Query Logfile"
+msgstr "DNS 查詢日誌檔案"
+
+msgid "DNSCrypt-Proxy"
+msgstr "DNSCrypt-Proxy"
+
+msgid "DNSCrypt-Proxy Logfile"
+msgstr "DNSCrypt-Proxy 日誌檔案"
+
+msgid "DNSCrypt-Proxy Resolver List"
+msgstr "DNSCrypt-Proxy 解æžä¼ºæœå™¨åˆ—表"
+
+msgid "Default Resolver List"
+msgstr "é è¨­è§£æžä¼ºæœå™¨åˆ—表"
+
+msgid "Disable IPv6 to speed up DNSCrypt-Proxy."
+msgstr "ç¦ç”¨ IPv6 以加速 DNSCrypt-Proxy。"
+
+msgid "Dnsmasq Options"
+msgstr "Dnsmasq é¸é …"
+
+msgid ""
+"Download the current resolver list from 'github.com/dyne/dnscrypt-proxy'."
+msgstr "從“github.com/dyne/DNSCrypt-Proxyâ€ä¸‹è¼‰ç•¶å‰çš„解æžä¼ºæœå™¨åˆ—表。"
+
+msgid "Edit DNSCrypt-Proxy Configuration"
+msgstr "編輯 DNSCrypt-Proxy é…ç½®"
+
+msgid "Edit Dnsmasq Configuration"
+msgstr "編輯 Dnsmasq é…ç½®"
+
+msgid "Edit Resolvcrypt Configuration"
+msgstr "編輯 Resolvcrypt é…ç½®"
+
+msgid "Enable Caching to speed up DNSCcrypt-Proxy."
+msgstr "啟用快å–以加速 DNSCcrypt-Proxy。"
+
+msgid "Ephemeral Keys"
+msgstr "臨時金鑰"
+
+msgid "File Checksum"
+msgstr "檔案校驗和"
+
+msgid "File Date"
+msgstr "檔案日期"
+
+msgid ""
+"For further information <a href=\"%s\" target=\"_blank\">see the wiki "
+"online</a>"
+msgstr "詳細資訊請<a href=\"%s\" target=\"_blank\">檢視線上 wiki</a>"
+
+msgid "General Options"
+msgstr "常è¦é¸é …"
+
+msgid "IP Address"
+msgstr "IP ä½å€"
+
+msgid "Improve privacy by using an ephemeral public key for each query."
+msgstr "æ¯æ¬¡æŸ¥è©¢ä½¿ç”¨ä¸åŒçš„臨時公鑰,以增強隱ç§ã€‚"
+
+msgid "Input file not found, please check your configuration."
+msgstr "未找到輸入檔案,請檢查您的é…置。"
+
+msgid "Instance Options"
+msgstr "例項é¸é …"
+
+msgid "Local Cache"
+msgstr "本地快å–"
+
+msgid ""
+"Local blacklists allow you to block abuse sites by domains or ip addresses."
+msgstr "本地黑å單,å…許您按域å或 IP ä½å€æ””截有害網站。"
+
+msgid ""
+"Log the received DNS queries to a file, so you can watch in real-time what "
+"is happening on the network."
+msgstr "將收到的 DNS 查詢記錄到檔案中,以便您å¯ä»¥å¯¦æ™‚檢視網路上發生的情æ³ã€‚"
+
+msgid ""
+"Name of the remote DNS service for resolving queries incl. Location, DNSSEC- "
+"and NOLOG-Flag."
+msgstr "ç”¨æ–¼è§£æž DNS 查詢的é ç«¯ä¼ºæœå™¨å稱,包括ä½ç½®ã€DNSSEC- å’Œ NOLOG-Flag。"
+
+msgid "No SSL support available.<br />"
+msgstr "ç„¡ SSL 支æ´ã€‚<br />"
+
+msgid "No default resolver list and no SSL support available.<br />"
+msgstr "ç„¡é è¨­è§£æžä¼ºæœå™¨åˆ—表,也無 SSL 支æ´ã€‚<br />"
+
+msgid "Overview"
+msgstr "概述"
+
+msgid "Please edit the file manually in the 'Advanced' section."
+msgstr "請在“高階â€éƒ¨åˆ†ä¸­æ‰‹å‹•ç·¨è¼¯æª”案。"
+
+msgid ""
+"Please install a 'libustream-ssl' library to download the current resolver "
+"list from 'github.com/dyne/dnscrypt-proxy'."
+msgstr ""
+"è¦å¾žâ€œgithub.com/dyne/DNSCrypt-Proxyâ€ä¸‹è¼‰ç•¶å‰çš„解æžä¼ºæœå™¨åˆ—表,請安"
+"è£â€œlibustream-sslâ€åº«ã€‚"
+
+msgid ""
+"Please install a resolver list to '/usr/share/dnscrypt-proxy/dnscrypt-"
+"resolvers.csv' to use this package."
+msgstr ""
+"è¦ä½¿ç”¨æ­¤ç¨‹å¼ï¼Œè«‹å°‡è§£æžä¼ºæœå™¨åˆ—表放到“/usr/share/DNSCrypt-Proxy/dnscrypt-"
+"resolvers.csvâ€ã€‚"
+
+msgid ""
+"Please note: This may change the values for 'noresolv', 'resolvfile', "
+"'allservers' and the list 'server' settings."
+msgstr ""
+"請注æ„:這å¯èƒ½æœƒæ›´æ”¹â€œnoresolvâ€ã€â€œresolvfileâ€ã€â€œallserversâ€å’Œâ€œserverâ€åˆ—表的設"
+"置值。"
+
+msgid "Port"
+msgstr "埠"
+
+msgid "Refresh List"
+msgstr "é‡æ–°æ•´ç†åˆ—表"
+
+msgid "Refresh Resolver List"
+msgstr "é‡æ–°æ•´ç†è§£æžä¼ºæœå™¨åˆ—表"
+
+msgid "Resolver (LOC/SEC/NOLOG)"
+msgstr "解æžä¼ºæœå™¨ï¼ˆLOC/SEC/NOLOG)"
+
+msgid "Save"
+msgstr "儲存"
+
+msgid "Specify a non-default Resolver List."
+msgstr "指定éžé è¨­çš„解æžä¼ºæœå™¨åˆ—表。"
+
+msgid "Startup Trigger"
+msgstr "啟動觸發器"
+
+msgid "The config file '/etc/resolv-crypt.conf' already exist.<br />"
+msgstr "é…置檔案“/etc/resolv-crypt.confâ€å·²ç¶“存在。<br />"
+
+msgid "The listening port for DNS queries."
+msgstr "DNS 查詢的監è½åŸ ã€‚"
+
+msgid ""
+"The local IPv4 or IPv6 address. The latter one should be specified within "
+"brackets, e.g. '[::1]'."
+msgstr "本地 IPv4 或 IPv6 ä½å€ã€‚後者應用方括號括起,如“[::1]â€ã€‚"
+
+msgid ""
+"The value for this property is the blocklist type and path to the file, e."
+"g.'domains:/path/to/dbl.txt' or 'ips:/path/to/ipbl.txt'."
+msgstr ""
+"此屬性的值是攔截列表的型別和檔案的路徑,例如“domains:/path/to/dbl."
+"txtâ€æˆ–“ips:/path/to/ipbl.txtâ€ã€‚"
+
+msgid ""
+"This form allows you to modify the content of the main DNSCrypt-Proxy "
+"configuration file (/etc/config/dnscrypt-proxy)."
+msgstr ""
+"此表單å…許您修改主 DNSCrypt-Proxy é…置檔案(/etc/config/dnscrypt-proxy)的內"
+"容。"
+
+msgid ""
+"This form allows you to modify the content of the main Dnsmasq configuration "
+"file (/etc/config/dhcp)."
+msgstr "此表單å…許您修改主 Dnsmasq é…置檔案(/etc/config/dhcp)的內容。"
+
+msgid ""
+"This form allows you to modify the content of the resolv-crypt configuration "
+"file (/etc/resolv-crypt.conf)."
+msgstr ""
+"此表單å…許您修改 resolv-crypt é…置檔案(/etc/resolv-crypt.conf)的內容。"
+
+msgid "This form shows the content of the current DNSCrypt Resolver List."
+msgstr "æ­¤è¡¨å–®é¡¯ç¤ºç•¶å‰ DNSCrypt 的解æžä¼ºæœå™¨åˆ—表。"
+
+msgid ""
+"This form shows the syslog output, pre-filtered for DNSCrypt-Proxy related "
+"messages only."
+msgstr "此表單顯示 syslog 輸出,僅é‡å° DNSCrypt-Proxy 相關訊æ¯é€²è¡Œé éŽæ¿¾ã€‚"
+
+msgid ""
+"This option requires extra CPU cycles and is useless with most DNSCrypt "
+"server."
+msgstr "æ­¤é¸é …需è¦é¡å¤–çš„ CPU 週期,å°å¤§å¤šæ•¸ DNSCrypt 伺æœå™¨éƒ½æ²’用。"
+
+msgid ""
+"To restrict the trigger, select only the relevant network interface. Usually "
+"the 'wan' interface should work for most users."
+msgstr ""
+"è¦é™åˆ¶è§¸ç™¼å™¨ï¼Œè«‹åªé¸æ“‡ç›¸é—œçš„網路介é¢ã€‚通常,“wanâ€ä»‹é¢æ‡‰è©²é©ç”¨æ–¼å¤§å¤šæ•¸ä½¿ç”¨è€…。"
+
+msgid "Transfer Options To Dnsmasq"
+msgstr "轉移é¸é …到 Dnsmasq "
+
+msgid "View Logfile"
+msgstr "檢視日誌檔案"
+
+msgid "View Resolver List"
+msgstr "檢視解æžä¼ºæœå™¨åˆ—表"
diff --git a/applications/luci-app-dynapoint/po/zh-cn/dynapoint.po b/applications/luci-app-dynapoint/po/zh-cn/dynapoint.po
new file mode 100644
index 0000000000..abbebe267f
--- /dev/null
+++ b/applications/luci-app-dynapoint/po/zh-cn/dynapoint.po
@@ -0,0 +1,105 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 18:48+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Activate this wVIF if status is:"
+msgstr "激活此 wVIF 如果状æ€ä¸ºï¼š"
+
+msgid "Append hostname to ssid"
+msgstr "将主机å附加到 SSID"
+
+msgid "Append the router's hostname to the SSID when connectivity check fails"
+msgstr "连接检查失败时,将路由器的主机å附加到 SSID"
+
+msgid "Check Internet connectivity via HTTP header download"
+msgstr "通过下载 HTTP 标头检查 Internet 连接性"
+
+msgid "Configuration"
+msgstr "é…ç½®"
+
+msgid "Curl is currently not installed. Please install the package in the"
+msgstr "ç›®å‰å°šæœªå®‰è£… Curl。请在以下链接中安装:"
+
+msgid "Device"
+msgstr "设备"
+
+msgid "Disabled"
+msgstr "ç¦ç”¨"
+
+msgid "DynaPoint"
+msgstr "DynaPoint"
+
+msgid "Dynamic Access Point Manager"
+msgstr "动æ€è®¿é—®ç‚¹ç®¡ç†å™¨"
+
+msgid "Enabled"
+msgstr "å¯ç”¨"
+
+msgid ""
+"Failure counter after how many failed download attempts, the state is "
+"considered as offline"
+msgstr "下载å°è¯•å¤±è´¥å‡ æ¬¡åŽï¼Œå°†è§†ä¸ºè„±æœºçŠ¶æ€"
+
+msgid "List of Wireless Virtual Interfaces (wVIF)"
+msgstr "无线虚拟接å£åˆ—表(wVIF)"
+
+msgid "List of host addresses"
+msgstr "主机地å€åˆ—表"
+
+msgid ""
+"List of host addresses (url or IP) to track and request http headers from"
+msgstr "è¦è·Ÿè¸ªå’Œè¯·æ±‚ HTTP 标头的主机地å€ï¼ˆURL 或 IP)列表"
+
+msgid "Mode"
+msgstr "模å¼"
+
+msgid "Not used by DynaPoint"
+msgstr "ä¸ä½¿ç”¨ DynaPoint"
+
+msgid "Offline"
+msgstr "离线"
+
+msgid "Online"
+msgstr "在线"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Software Section"
+msgstr "软件部分"
+
+msgid "Switch_to_offline threshold"
+msgstr "Switch_to_offline 阈值"
+
+msgid "Test-run interval"
+msgstr "测试间隔"
+
+msgid "Time interval in seconds to re-start a new test run"
+msgstr "é‡æ–°å¼€å§‹æ–°æµ‹è¯•çš„时间间隔(秒)"
+
+msgid "Use curl"
+msgstr "使用 curl"
+
+msgid "Use curl instead of wget"
+msgstr "使用 curl 而ä¸æ˜¯ wget"
+
+msgid "Use curl instead of wget for testing the connectivity."
+msgstr "使用 curl 而ä¸æ˜¯ wget æ¥æµ‹è¯•è¿žæŽ¥ã€‚"
+
+msgid "Used interface"
+msgstr "使用的接å£"
+
+msgid "Which interface should curl use. (Use ifconfig to find out)"
+msgstr "应该使用哪个接å£ã€‚(å¯ä»¥ä½¿ç”¨ ifconfig 命令查找)"
+
+msgid "WiFi Status"
+msgstr "Wi-Fi 状æ€"
diff --git a/applications/luci-app-dynapoint/po/zh-tw/dynapoint.po b/applications/luci-app-dynapoint/po/zh-tw/dynapoint.po
new file mode 100644
index 0000000000..82a3ff594e
--- /dev/null
+++ b/applications/luci-app-dynapoint/po/zh-tw/dynapoint.po
@@ -0,0 +1,105 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 18:49+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Activate this wVIF if status is:"
+msgstr "啟用此 wVIF 如果狀態為:"
+
+msgid "Append hostname to ssid"
+msgstr "將主機å附加到 SSID"
+
+msgid "Append the router's hostname to the SSID when connectivity check fails"
+msgstr "連線檢查失敗時,將路由器的主機å附加到 SSID"
+
+msgid "Check Internet connectivity via HTTP header download"
+msgstr "通éŽä¸‹è¼‰ HTTP 標頭檢查 Internet 連接性"
+
+msgid "Configuration"
+msgstr "é…ç½®"
+
+msgid "Curl is currently not installed. Please install the package in the"
+msgstr "ç›®å‰å°šæœªå®‰è£ Curl。請在以下連çµä¸­å®‰è£ï¼š"
+
+msgid "Device"
+msgstr "è£ç½®"
+
+msgid "Disabled"
+msgstr "ç¦ç”¨"
+
+msgid "DynaPoint"
+msgstr "DynaPoint"
+
+msgid "Dynamic Access Point Manager"
+msgstr "動態訪å•é»žç®¡ç†å™¨"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid ""
+"Failure counter after how many failed download attempts, the state is "
+"considered as offline"
+msgstr "下載嘗試失敗幾次後,將視為離線狀態"
+
+msgid "List of Wireless Virtual Interfaces (wVIF)"
+msgstr "無線虛擬介é¢åˆ—表(wVIF)"
+
+msgid "List of host addresses"
+msgstr "主機ä½å€åˆ—表"
+
+msgid ""
+"List of host addresses (url or IP) to track and request http headers from"
+msgstr "è¦è·Ÿè¹¤å’Œè«‹æ±‚ HTTP 標頭的主機ä½å€ï¼ˆURL 或 IP)列表"
+
+msgid "Mode"
+msgstr "模å¼"
+
+msgid "Not used by DynaPoint"
+msgstr "ä¸ä½¿ç”¨ DynaPoint"
+
+msgid "Offline"
+msgstr "離線"
+
+msgid "Online"
+msgstr "在線"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Software Section"
+msgstr "軟體部分"
+
+msgid "Switch_to_offline threshold"
+msgstr "Switch_to_offline 閾值"
+
+msgid "Test-run interval"
+msgstr "測試間隔"
+
+msgid "Time interval in seconds to re-start a new test run"
+msgstr "é‡æ–°é–‹å§‹æ–°æ¸¬è©¦çš„時間間隔(秒)"
+
+msgid "Use curl"
+msgstr "使用 curl"
+
+msgid "Use curl instead of wget"
+msgstr "使用 curl 而ä¸æ˜¯ wget"
+
+msgid "Use curl instead of wget for testing the connectivity."
+msgstr "使用 curl 而ä¸æ˜¯ wget 來測試連接。"
+
+msgid "Used interface"
+msgstr "使用的介é¢"
+
+msgid "Which interface should curl use. (Use ifconfig to find out)"
+msgstr "應該使用哪個介é¢ã€‚(å¯ä»¥ä½¿ç”¨ ifconfig 指令查詢)"
+
+msgid "WiFi Status"
+msgstr "Wi-Fi 狀態"
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
index 273675cd30..82168712ae 100644
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
@@ -1,11 +1,9 @@
<%
local fw = require "luci.model.firewall".init()
- local wz = fw:get_zone("wan")
- local lz = fw:get_zone("lan")
local zones = fw:get_zones()
%>
-<% if wz then %>
+<% if #zones > 0 then %>
<h4><%:Open ports on router%></h4>
<div class="table">
<div class="tr cbi-section-table-titles">
@@ -71,7 +69,7 @@
<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
<% end %>
-<% if wz then %>
+<% if #zones > 0 then %>
<script type="text/javascript">//<![CDATA[
cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
cbi_bind(document.getElementById('_newopen.extport'), 'blur',
diff --git a/applications/luci-app-firewall/po/ru/firewall.po b/applications/luci-app-firewall/po/ru/firewall.po
index 79c0f0b9a6..b73d963d8f 100644
--- a/applications/luci-app-firewall/po/ru/firewall.po
+++ b/applications/luci-app-firewall/po/ru/firewall.po
@@ -3,12 +3,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: LuCI: firewall\n"
"POT-Creation-Date: 2013-09-05 16:02+0200\n"
-"PO-Revision-Date: 2018-01-18 21:58+0300\n"
+"PO-Revision-Date: 2018-09-06 09:29+0300\n"
"Language-Team: http://cyber-place.ru\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Vladimir aka sunny <picfun@ya.ru>\n"
+"Last-Translator: Anton Kikin <a.kikin@tano-systems.com>\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n"
"%100<10 || n%100>=20) ? 1 : 2);\n"
"Language: ru\n"
@@ -43,13 +43,13 @@ msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> Ñ Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¾Ð¼ в %s"
msgid "Accept forward"
-msgstr "ПринÑÑ‚ÑŒ перенаправление"
+msgstr "Принимать перенаправлÑемый трафик"
msgid "Accept input"
-msgstr "ПринÑÑ‚ÑŒ входÑщий трафик"
+msgstr "Принимать входÑщий трафик"
msgid "Accept output"
-msgstr ""
+msgstr "Принимать иÑходÑщий трафик"
msgid "Action"
msgstr "ДейÑтвие"
@@ -64,7 +64,7 @@ msgid "Advanced Settings"
msgstr "Дополнительные наÑтройки"
msgid "Allow forward from <em>source zones</em>:"
-msgstr "Разрешить перенаправление из <em>'зон-иÑточников'</em>:"
+msgstr "Разрешить перенаправление из <em>'зон иÑточников'</em>:"
msgid "Allow forward to <em>destination zones</em>:"
msgstr "Разрешить перенаправление в <em>'зоны назначениÑ'</em>:"
@@ -84,9 +84,9 @@ msgid ""
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
"ПользовательÑкие правила позволÑÑŽÑ‚ выполнÑÑ‚ÑŒ произвольные команды iptables, "
-"которые не охвачены рамками межÑетевого Ñкрана.<br />Команды выполнÑÑŽÑ‚ÑÑ "
-"поÑле каждой перезагрузки межÑетевого Ñкрана, Ñразу поÑле загрузки набора "
-"правил по умолчанию."
+"которые не охвачены рамками межÑетевого Ñкрана. Команды выполнÑÑŽÑ‚ÑÑ Ð¿Ð¾Ñле "
+"каждой перезагрузки межÑетевого Ñкрана, Ñразу поÑле загрузки набора правил "
+"по умолчанию."
msgid "Destination IP address"
msgstr "IP-Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
@@ -104,28 +104,28 @@ msgid "Disable"
msgstr "Отключить"
msgid "Discard forward"
-msgstr "Отключить перенаправление"
+msgstr "ОтклонÑÑ‚ÑŒ перенаправлÑемый трафик"
msgid "Discard input"
-msgstr "Отключить входÑщий трафик"
+msgstr "ОтклонÑÑ‚ÑŒ входÑщий трафик"
msgid "Discard output"
-msgstr ""
+msgstr "ОтклонÑÑ‚ÑŒ иÑходÑщий трафик"
msgid "Do not rewrite"
msgstr "Ðе перезапиÑывать"
msgid "Do not track forward"
-msgstr "Ðе отÑлеживать перенаправление"
+msgstr "Ðе отÑлеживать перенаправлÑемый трафик"
msgid "Do not track input"
msgstr "Ðе отÑлеживать входÑщий трафик"
msgid "Do not track output"
-msgstr ""
+msgstr "Ðе отÑлеживать иÑходÑщий трафик"
msgid "Drop invalid packets"
-msgstr "Ðе пропуÑкать<br />некорректные пакеты"
+msgstr "ОтбраÑывать некорректные пакеты"
msgid "Enable"
msgstr "Включить"
@@ -134,13 +134,13 @@ msgid "Enable NAT Loopback"
msgstr "Включить NAT Loopback"
msgid "Enable SYN-flood protection"
-msgstr "Включить защиту<br />от SYN-flood атак"
+msgstr "Включить защиту от SYN-flood атак"
msgid "Enable logging on this zone"
msgstr "Включить журналирование в Ñтой зоне"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
-msgstr ""
+msgstr "ЭкÑпериментальный функционал. Ðе полноÑтью ÑовмеÑтим Ñ QoS/SQM."
msgid "External IP address"
msgstr "Внешний IP-адреÑ"
@@ -152,7 +152,7 @@ msgid "External zone"
msgstr "ВнешнÑÑ Ð·Ð¾Ð½Ð°"
msgid "Extra arguments"
-msgstr "Дополнительные<br />аргументы"
+msgstr "Дополнительные аргументы"
msgid "Firewall"
msgstr "МежÑетевой Ñкран"
@@ -176,7 +176,7 @@ msgid "Forward"
msgstr "Перенаправление"
msgid "Forward to"
-msgstr "ПеренаправлÑÑ‚ÑŒ из"
+msgstr "ПеренаправлÑÑ‚ÑŒ на"
msgid "Friday"
msgstr "ПÑтница"
@@ -191,19 +191,19 @@ msgid "From %s in %s with source %s and %s"
msgstr "Из %s в %s Ñ Ð¸Ñточниками %s и %s"
msgid "From %s on <var>this device</var>"
-msgstr ""
+msgstr "Из %s в <var>Ñто уÑтройÑтво</var>"
msgid "From %s on <var>this device</var> with source %s"
-msgstr ""
+msgstr "Из %s в <var>Ñто уÑтройÑтво</var> Ñ Ð¸Ñточником %s"
msgid "From %s on <var>this device</var> with source %s and %s"
-msgstr ""
+msgstr "Из %s в <var>Ñто уÑтройÑтво</var> Ñ Ð¸Ñточниками %s and %s"
msgid "General Settings"
msgstr "ОÑновные наÑтройки"
msgid "Hardware flow offloading"
-msgstr ""
+msgstr "Ðппаратный flow offloading"
msgid "IP"
msgstr "IP-адреÑ"
@@ -260,22 +260,21 @@ msgid "Masquerading"
msgstr "МаÑкарадинг"
msgid "Match"
-msgstr "ПеренаправлÑÑ‚ÑŒ в"
+msgstr "ВходÑщий трафик"
msgid "Match ICMP type"
-msgstr "СоответÑтвовать<br />ICMP типу"
+msgstr "СоответÑтвовать ICMP типу"
msgid "Match forwarded traffic to the given destination port or port range."
msgstr ""
-"Перенаправить ÑоответÑтвующий трафик на определённый порт или диапазон "
-"портов. "
+"ПеренаправлÑÑ‚ÑŒ ÑоответÑтвующий трафик на указанный порт или диапазон портов."
msgid ""
"Match incoming traffic directed at the given destination port or port range "
"on this host"
msgstr ""
-"Порт который будет принимать входÑщий трафик из иÑточника 'Внутренний "
-"порт' (Ñм.ниже)."
+"Порт или диапазон портов, входÑщие Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° который будут "
+"перенаправлÑÑ‚ÑŒÑÑ Ð½Ð° внутренний порт внутреннего IP-адреÑа (Ñм. ниже)"
msgid ""
"Match incoming traffic originating from the given source port or port range "
@@ -288,7 +287,7 @@ msgid "Monday"
msgstr "Понедельник"
msgid "Month Days"
-msgstr "Дни МеÑÑца"
+msgstr "Дни меÑÑца"
msgid "Name"
msgstr "ИмÑ"
@@ -310,22 +309,22 @@ msgstr "Ðовый SNAT"
msgid "Only match incoming traffic directed at the given IP address."
msgstr ""
-"IP-Ð°Ð´Ñ€ÐµÑ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ будет принимать входÑщий трафик из иÑточника 'Внутренний IP-"
-"адреÑ' (Ñм.ниже) ."
+"ПрименÑÑ‚ÑŒ правило только Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих подключений на указанный IP-адреÑ"
msgid "Only match incoming traffic from these MACs."
-msgstr "Выбирать только входÑщий трафик от Ñтих MAC-адреÑов."
+msgstr "ПрименÑÑ‚ÑŒ правило только Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщего трафика от Ñтих MAC-адреÑов."
msgid "Only match incoming traffic from this IP or range."
msgstr ""
-"Выбирать только входÑщий трафик от Ñтого IP-адреÑа или диапазона адреÑов."
+"ПрименÑÑ‚ÑŒ правило только Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщего трафика от Ñтого IP-адреÑа или "
+"диапазона адреÑов."
msgid ""
"Only match incoming traffic originating from the given source port or port "
"range on the client host"
msgstr ""
-"Выбирать только входÑщий трафик, иÑходÑщий из указанного порта или диапазона "
-"портов клиентÑкого хоÑта"
+"ПрименÑÑ‚ÑŒ правило только Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщего трафика от указанного порта или "
+"диапазона портов клиентÑкого хоÑта"
msgid "Open ports on router"
msgstr "Открыть порты на маршрутизаторе"
@@ -337,7 +336,7 @@ msgid "Output"
msgstr "ИÑходÑщий трафик"
msgid "Output zone"
-msgstr ""
+msgstr "ИÑходÑÑ‰Ð°Ñ Ð·Ð¾Ð½Ð°"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr ""
@@ -360,24 +359,24 @@ msgstr "Протокол"
msgid ""
"Redirect matched incoming traffic to the given port on the internal host"
msgstr ""
-"Перенаправить иÑходÑщий трафик Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ порта на 'Внешний порт' (Ñм.выше)."
+"ПеренаправлÑÑ‚ÑŒ трафик на указанный порт или диапазон портов внутреннего IP-"
+"адреÑа"
msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr ""
-"Перенаправить иÑходÑщий трафик Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ IP-адреÑа на 'Внешний IP-адреÑ' (Ñм."
-"выше)."
+msgstr "ПеренаправлÑÑ‚ÑŒ трафик на указанный IP-адреÑ"
msgid "Refuse forward"
-msgstr "СбраÑывать перенаправление"
+msgstr "СбраÑывать перенаправлÑемый трафик"
msgid "Refuse input"
msgstr "СбраÑывать входÑщий трафик"
msgid "Refuse output"
-msgstr ""
+msgstr "СбраÑывать иÑходÑщий трафик"
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr ""
+"ТребуетÑÑ Ð°Ð¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° NAT. Реализовано, по крайней мере, Ð´Ð»Ñ mt7621"
msgid "Restart Firewall"
msgstr "ПерезапуÑтить межÑетевой Ñкран"
@@ -408,7 +407,7 @@ msgid "Rewrite to source %s, %s"
msgstr "ПеренаправлÑÑ‚ÑŒ к иÑточнику %s, %s"
msgid "Routing/NAT Offloading"
-msgstr ""
+msgstr "МаршрутизациÑ/NAT offloading"
msgid "Rule is disabled"
msgstr "Правило отключено"
@@ -426,10 +425,10 @@ msgid "Saturday"
msgstr "Суббота"
msgid "Software based offloading for routing/NAT"
-msgstr ""
+msgstr "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð°Ñ Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ offloading Ð´Ð»Ñ Ð¼Ð°Ñ€ÑˆÑ€ÑƒÑ‚Ð¸Ð·Ð°Ñ†Ð¸Ð¸/NAT"
msgid "Software flow offloading"
-msgstr ""
+msgstr "Программный flow offloading"
msgid "Source IP address"
msgstr "IP-Ð°Ð´Ñ€ÐµÑ Ð¸Ñточника"
@@ -460,16 +459,16 @@ msgid "Source zone"
msgstr "Зона иÑточника"
msgid "Start Date (yyyy-mm-dd)"
-msgstr "Дата начала<br />(год-меÑ-день)"
+msgstr "Дата начала (год-меÑ-день)"
msgid "Start Time (hh:mm:ss)"
-msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°<br />(чч:мм:ÑÑ)"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° (чч:мм:ÑÑ)"
msgid "Stop Date (yyyy-mm-dd)"
-msgstr "Дата оÑтановки<br />(год-меÑ-день)"
+msgstr "Дата Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ (год-меÑ-день)"
msgid "Stop Time (hh:mm:ss)"
-msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾Ñтановки<br />(чч:мм:ÑÑ)"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ (чч:мм:ÑÑ)"
msgid "Sunday"
msgstr "ВоÑкреÑенье"
@@ -487,26 +486,27 @@ msgid ""
"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
"<em>not</em> imply a permission to forward from wan to lan as well."
msgstr ""
-"Данные наÑтройки управлÑÑŽÑ‚ политиками Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ Ñтой (%s) и "
-"другими зонами. Трафиком <em>'зон-назначениÑ'</em> ÑвлÑетÑÑ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹ "
-"трафик <strong>'иÑходÑщий из %q'</strong>. Трафиком <em>'зон-иÑточников'</"
-"em> ÑвлÑетÑÑ Ñ‚Ñ€Ð°Ñ„Ð¸Ðº <strong>'направленый в %q'</strong>. Перенаправление "
-"ÑвлÑетÑÑ <em>'однонаправленным'</em>, то еÑÑ‚ÑŒ перенаправление из lan в wan "
-"<em>'не'</em> допуÑкает перенаправление трафика из wan в lan."
+"Данные наÑтройки управлÑÑŽÑ‚ политиками Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚Ñ€Ð°Ñ„Ð¸ÐºÐ° между Ñтой "
+"(%s) и другими зонами. Трафиком <em>'зон-назначениÑ'</em> ÑвлÑетÑÑ "
+"перенаправленный трафик <strong>'иÑходÑщий из %q'</strong>. Трафиком "
+"<em>'зон-иÑточников'</em> ÑвлÑетÑÑ Ñ‚Ñ€Ð°Ñ„Ð¸Ðº <strong>'направленый в %q'</"
+"strong>. Перенаправление ÑвлÑетÑÑ <em>'однонаправленным'</em>, то еÑÑ‚ÑŒ "
+"перенаправление из lan в wan <em>'не'</em> допуÑкает перенаправление трафика "
+"из wan в lan."
msgid ""
"This page allows you to change advanced properties of the port forwarding "
"entry. In most cases there is no need to modify those settings."
msgstr ""
"Ðа Ñтой Ñтранице можно изменить раÑширенные наÑтройки Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð²."
-"<br />Ð’ большинÑтве Ñлучаев нет необходимоÑти изменÑÑ‚ÑŒ Ñти параметры."
+"Ð’ большинÑтве Ñлучаев нет необходимоÑти изменÑÑ‚ÑŒ Ñти параметры."
msgid ""
"This page allows you to change advanced properties of the traffic rule "
"entry, such as matched source and destination hosts."
msgstr ""
-"Ðа Ñтой Ñтранице можно изменить раÑширенные наÑтройки правил Ð´Ð»Ñ Ñ‚Ñ€Ð°Ñ„Ð¸ÐºÐ°."
-"<br />Ð’ большинÑтве Ñлучаев нет необходимоÑти изменÑÑ‚ÑŒ Ñти параметры."
+"Ðа Ñтой Ñтранице можно изменить раÑширенные наÑтройки правил Ð´Ð»Ñ Ñ‚Ñ€Ð°Ñ„Ð¸ÐºÐ°.Ð’ "
+"большинÑтве Ñлучаев нет необходимоÑти изменÑÑ‚ÑŒ Ñти параметры."
msgid ""
"This section defines common properties of %q. The <em>input</em> and "
@@ -518,7 +518,7 @@ msgstr ""
"Страница Ñодержит общие ÑвойÑтва %q. Режимы <em>'ВходÑщий трафик'</em> и "
"<em>'ИÑходÑщий трафик'</em> уÑтанавливают политики по умолчанию Ð´Ð»Ñ Ñ‚Ñ€Ð°Ñ„Ð¸ÐºÐ°, "
"поÑтупающего и покидающего Ñту зону, в то Ð²Ñ€ÐµÐ¼Ñ ÐºÐ°Ðº режим "
-"<em>'Перенаправление'</em> опиÑывает политику переÑылки трафика между "
+"<em>'Перенаправление'</em> опиÑывает политику Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ‚Ñ€Ð°Ñ„Ð¸ÐºÐ° между "
"различными ÑетÑми внутри зоны. <em>'ИÑпользовать Ñети'</em> указывает, какие "
"доÑтупные Ñети ÑвлÑÑŽÑ‚ÑÑ Ñ‡Ð»ÐµÐ½Ð°Ð¼Ð¸ Ñтой зоны."
@@ -529,7 +529,7 @@ msgid "Time in UTC"
msgstr "Ð’Ñ€ÐµÐ¼Ñ UTC"
msgid "To %s at %s on <var>this device</var>"
-msgstr "К %s, порту %s на <var>Ñтом уÑтройÑтве</var>"
+msgstr "К %s, %s на <var>Ñтом уÑтройÑтве</var>"
msgid "To %s in %s"
msgstr "К %s в %s"
@@ -562,19 +562,19 @@ msgid "Tuesday"
msgstr "Вторник"
msgid "Unnamed SNAT"
-msgstr ""
+msgstr "SNAT без имени"
msgid "Unnamed forward"
-msgstr ""
+msgstr "Перенаправление без имени"
msgid "Unnamed rule"
-msgstr ""
+msgstr "Правило без имени"
msgid "Via %s"
msgstr "Через %s"
msgid "Via %s at %s"
-msgstr "Через %s, порт %s"
+msgstr "Через %s, %s"
msgid "Wednesday"
msgstr "Среда"
diff --git a/applications/luci-app-firewall/po/zh-cn/firewall.po b/applications/luci-app-firewall/po/zh-cn/firewall.po
index bd3ad4e80d..aa36271b21 100644
--- a/applications/luci-app-firewall/po/zh-cn/firewall.po
+++ b/applications/luci-app-firewall/po/zh-cn/firewall.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-28 18:56+0800\n"
+"PO-Revision-Date: 2018-08-08 08:28+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "%s in %s"
@@ -45,7 +45,7 @@ msgid "Accept input"
msgstr "接å—入站"
msgid "Accept output"
-msgstr ""
+msgstr "接å—出站"
msgid "Action"
msgstr "动作"
@@ -54,7 +54,7 @@ msgid "Add"
msgstr "添加"
msgid "Add and edit..."
-msgstr "添加并编辑..."
+msgstr "添加并编辑…"
msgid "Advanced Settings"
msgstr "高级设置"
@@ -104,7 +104,7 @@ msgid "Discard input"
msgstr "丢弃入站"
msgid "Discard output"
-msgstr ""
+msgstr "丢弃出站"
msgid "Do not rewrite"
msgstr "ä¸é‡å†™"
@@ -116,7 +116,7 @@ msgid "Do not track input"
msgstr "ä¸è·Ÿè¸ªå…¥ç«™"
msgid "Do not track output"
-msgstr ""
+msgstr "ä¸è·Ÿè¸ªå‡ºç«™"
msgid "Drop invalid packets"
msgstr "丢弃无效数æ®åŒ…"
@@ -185,13 +185,13 @@ msgid "From %s in %s with source %s and %s"
msgstr "æ¥è‡ª %s ä½äºŽ %s æºç«¯å£ %s æº MAC %s"
msgid "From %s on <var>this device</var>"
-msgstr ""
+msgstr "æ¥è‡ª %s ä½äºŽ<var>本设备</var>"
msgid "From %s on <var>this device</var> with source %s"
-msgstr ""
+msgstr "æ¥è‡ª %s ä½äºŽ<var>本设备</var>æºäºŽ %s"
msgid "From %s on <var>this device</var> with source %s and %s"
-msgstr ""
+msgstr "æ¥è‡ª %s ä½äºŽ<var>本设备</var>æºç«¯å£ %s æº MAC %s"
msgid "General Settings"
msgstr "基本设置"
@@ -320,7 +320,7 @@ msgid "Output"
msgstr "出站数æ®"
msgid "Output zone"
-msgstr ""
+msgstr "出站区域"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "传递到 iptables çš„é¢å¤–å‚数。å°å¿ƒä½¿ç”¨ï¼"
@@ -351,7 +351,7 @@ msgid "Refuse input"
msgstr "æ‹’ç»å…¥ç«™"
msgid "Refuse output"
-msgstr ""
+msgstr "æ‹’ç»å‡ºç«™"
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "需è¦ç¡¬ä»¶ NAT 支æŒã€‚ç›®å‰ mt7621 已实现"
@@ -525,13 +525,13 @@ msgid "Tuesday"
msgstr "星期二"
msgid "Unnamed SNAT"
-msgstr ""
+msgstr "未命å SNAT"
msgid "Unnamed forward"
-msgstr ""
+msgstr "未命å转å‘"
msgid "Unnamed rule"
-msgstr ""
+msgstr "未命å规则"
msgid "Via %s"
msgstr "通过 %s"
@@ -590,7 +590,7 @@ msgid "minute"
msgstr "分钟"
msgid "not"
-msgstr ""
+msgstr "éž"
msgid "port"
msgstr "端å£"
diff --git a/applications/luci-app-firewall/po/zh-tw/firewall.po b/applications/luci-app-firewall/po/zh-tw/firewall.po
index ea7901ae8c..5a3c6bece1 100644
--- a/applications/luci-app-firewall/po/zh-tw/firewall.po
+++ b/applications/luci-app-firewall/po/zh-tw/firewall.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-28 18:56+0800\n"
+"PO-Revision-Date: 2018-08-08 08:28+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "%s in %s"
@@ -30,22 +30,22 @@ msgid "(Unnamed SNAT)"
msgstr "(未命å SNAT)"
msgid "<var>%d</var> pkts. per <var>%s</var>"
-msgstr "<var>%d</var> è³‡æ–™åŒ…ã€‚æ¯ <var>%s</var>"
+msgstr "<var>%d</var> 資料包/<var>%s</var>"
msgid "<var>%d</var> pkts. per <var>%s</var>, burst <var>%d</var> pkts."
-msgstr "<var>%d</var> è³‡æ–™åŒ…ã€‚æ¯ <var>%s</var>,çªç™¼ <var>%d</var> 資料包。"
+msgstr "<var>%d</var> 資料包/<var>%s</var>,çªç™¼ <var>%d</var> 資料包。"
msgid "<var>%s</var> and limit to %s"
msgstr "<var>%s</var> 並é™åˆ¶åˆ° %s"
msgid "Accept forward"
-msgstr ""
+msgstr "接å—轉發"
msgid "Accept input"
-msgstr ""
+msgstr "接å—入站"
msgid "Accept output"
-msgstr ""
+msgstr "接å—出站"
msgid "Action"
msgstr "動作"
@@ -54,7 +54,7 @@ msgid "Add"
msgstr "新增"
msgid "Add and edit..."
-msgstr "新增並編輯..."
+msgstr "新增並編輯…"
msgid "Advanced Settings"
msgstr "高階設定"
@@ -72,15 +72,15 @@ msgid "Covered networks"
msgstr "覆蓋網路"
msgid "Custom Rules"
-msgstr "自定義è¦å‰‡"
+msgstr "自訂è¦å‰‡"
msgid ""
"Custom rules allow you to execute arbitrary iptables commands which are not "
"otherwise covered by the firewall framework. The commands are executed after "
"each firewall restart, right after the default ruleset has been loaded."
msgstr ""
-"自定義è¦å‰‡å…許您執行ä¸å±¬æ–¼é˜²ç«ç‰†æ¡†æž¶çš„ä»»æ„ iptables 命令。æ¯æ¬¡é‡å•Ÿé˜²ç«ç‰†æ™‚,"
-"在é è¨­çš„è¦å‰‡åŸ·è¡Œå¾Œé€™äº›å‘½ä»¤å°‡ç«‹å³åŸ·è¡Œã€‚"
+"自訂è¦å‰‡å…許您執行ä¸å±¬æ–¼é˜²ç«ç‰†æ¡†æž¶çš„ä»»æ„ iptables 指令。æ¯æ¬¡é‡å•Ÿé˜²ç«ç‰†æ™‚,在"
+"é è¨­çš„è¦å‰‡åŸ·è¡Œå¾Œé€™äº›æŒ‡ä»¤å°‡ç«‹å³åŸ·è¡Œã€‚"
msgid "Destination IP address"
msgstr "目標 IP ä½å€"
@@ -95,28 +95,28 @@ msgid "Destination zone"
msgstr "目標å€åŸŸ"
msgid "Disable"
-msgstr ""
+msgstr "ç¦ç”¨"
msgid "Discard forward"
-msgstr ""
+msgstr "丟棄轉發"
msgid "Discard input"
-msgstr ""
+msgstr "丟棄入站"
msgid "Discard output"
-msgstr ""
+msgstr "丟棄出站"
msgid "Do not rewrite"
msgstr "ä¸é‡å¯«"
msgid "Do not track forward"
-msgstr ""
+msgstr "ä¸è·Ÿè¹¤è½‰ç™¼"
msgid "Do not track input"
-msgstr ""
+msgstr "ä¸è·Ÿè¹¤å…¥ç«™"
msgid "Do not track output"
-msgstr ""
+msgstr "ä¸è·Ÿè¹¤å‡ºç«™"
msgid "Drop invalid packets"
msgstr "丟棄無效資料包"
@@ -134,7 +134,7 @@ msgid "Enable logging on this zone"
msgstr "啟用此å€åŸŸçš„日誌記錄"
msgid "Experimental feature. Not fully compatible with QoS/SQM."
-msgstr ""
+msgstr "實驗特性。與 QoS/SQM ä¸å®Œå…¨ç›¸å®¹ã€‚"
msgid "External IP address"
msgstr "外部 IP ä½å€"
@@ -152,7 +152,7 @@ msgid "Firewall"
msgstr "防ç«ç‰†"
msgid "Firewall - Custom Rules"
-msgstr "防ç«ç‰† - 自定義è¦å‰‡"
+msgstr "防ç«ç‰† - 自訂è¦å‰‡"
msgid "Firewall - Port Forwards"
msgstr "防ç«ç‰† - 埠轉發"
@@ -185,28 +185,28 @@ msgid "From %s in %s with source %s and %s"
msgstr "來自 %s ä½æ–¼ %s æºåŸ  %s æº MAC %s"
msgid "From %s on <var>this device</var>"
-msgstr ""
+msgstr "來自 %s ä½æ–¼<var>本è£ç½®</var>"
msgid "From %s on <var>this device</var> with source %s"
-msgstr ""
+msgstr "來自 %s ä½æ–¼<var>本è£ç½®</var>æºæ–¼ %s"
msgid "From %s on <var>this device</var> with source %s and %s"
-msgstr ""
+msgstr "來自 %s ä½æ–¼<var>本è£ç½®</var>æºåŸ  %s æº MAC %s"
msgid "General Settings"
msgstr "基本設定"
msgid "Hardware flow offloading"
-msgstr ""
+msgstr "硬體æµé‡åˆ†è¼‰"
msgid "IP"
-msgstr ""
+msgstr "IP"
msgid "IP range"
-msgstr ""
+msgstr "IP 範åœ"
msgid "IPs"
-msgstr ""
+msgstr "IP"
msgid "IPv4"
msgstr "IPv4"
@@ -242,10 +242,10 @@ msgid "Limit log messages"
msgstr "é™åˆ¶æ—¥èªŒè³‡è¨Š"
msgid "MAC"
-msgstr ""
+msgstr "MAC"
msgid "MACs"
-msgstr ""
+msgstr "MAC"
msgid "MSS clamping"
msgstr "MSS 鉗制"
@@ -320,7 +320,7 @@ msgid "Output"
msgstr "出站資料"
msgid "Output zone"
-msgstr ""
+msgstr "出站å€åŸŸ"
msgid "Passes additional arguments to iptables. Use with care!"
msgstr "傳éžåˆ° iptables çš„é¡å¤–引數。å°å¿ƒä½¿ç”¨ï¼"
@@ -344,16 +344,16 @@ msgid "Redirect matched incoming traffic to the specified internal host"
msgstr "é‡å®šå‘匹é…的入站æµé‡åˆ°æŒ‡å®šçš„內部主機"
msgid "Refuse forward"
-msgstr ""
+msgstr "拒絕轉發"
msgid "Refuse input"
-msgstr ""
+msgstr "拒絕入站"
msgid "Refuse output"
-msgstr ""
+msgstr "拒絕出站"
msgid "Requires hardware NAT support. Implemented at least for mt7621"
-msgstr ""
+msgstr "需è¦ç¡¬é«” NAT 支æ´ã€‚ç›®å‰ mt7621 已實ç¾"
msgid "Restart Firewall"
msgstr "é‡å•Ÿé˜²ç«ç‰†"
@@ -382,13 +382,13 @@ msgid "Rewrite to source %s, %s"
msgstr "æºä½å€æ”¹å¯«æˆ %s, %s"
msgid "Routing/NAT Offloading"
-msgstr ""
+msgstr "Routing/NAT 分載"
msgid "Rule is disabled"
-msgstr ""
+msgstr "è¦å‰‡å·²ç¦ç”¨"
msgid "Rule is enabled"
-msgstr ""
+msgstr "è¦å‰‡å·²å•Ÿç”¨"
msgid "SNAT IP address"
msgstr "SNAT IP ä½å€"
@@ -400,10 +400,10 @@ msgid "Saturday"
msgstr "星期六"
msgid "Software based offloading for routing/NAT"
-msgstr ""
+msgstr "基於軟體的 Routing/NAT 分載"
msgid "Software flow offloading"
-msgstr ""
+msgstr "軟體æµé‡åˆ†è¼‰"
msgid "Source IP address"
msgstr "æº IP ä½å€"
@@ -524,13 +524,13 @@ msgid "Tuesday"
msgstr "星期二"
msgid "Unnamed SNAT"
-msgstr ""
+msgstr "未命å SNAT"
msgid "Unnamed forward"
-msgstr ""
+msgstr "未命å轉發"
msgid "Unnamed rule"
-msgstr ""
+msgstr "未命åè¦å‰‡"
msgid "Via %s"
msgstr "é€šéŽ %s"
@@ -547,7 +547,7 @@ msgstr "星期"
msgid ""
"You may specify multiple by selecting \"-- custom --\" and then entering "
"protocols separated by space."
-msgstr "您也å¯ä»¥é¸æ“‡â€œ--自定義--â€ä¾†å®šç¾©å¤šå€‹å”議,在多個å”議間需加空格。"
+msgstr "您也å¯ä»¥é¸æ“‡â€œ--自訂--â€ä¾†å®šç¾©å¤šå€‹å”議,在多個å”議間需加空格。"
msgid "Zone %q"
msgstr "å€åŸŸ %q"
@@ -574,7 +574,7 @@ msgid "any zone"
msgstr "所有å€åŸŸ"
msgid "day"
-msgstr ""
+msgstr "æ—¥"
msgid "don't track"
msgstr "ä¸è·Ÿè¹¤"
@@ -583,31 +583,31 @@ msgid "drop"
msgstr "丟棄"
msgid "hour"
-msgstr ""
+msgstr "å°æ™‚"
msgid "minute"
-msgstr ""
+msgstr "分é˜"
msgid "not"
-msgstr ""
+msgstr "éž"
msgid "port"
-msgstr ""
+msgstr "埠"
msgid "ports"
-msgstr ""
+msgstr "埠"
msgid "reject"
msgstr "拒絕"
msgid "second"
-msgstr ""
+msgstr "秒"
msgid "traffic"
msgstr "通訊"
msgid "type"
-msgstr ""
+msgstr "型別"
msgid "types"
-msgstr ""
+msgstr "型別"
diff --git a/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po
index 6a07b1dce9..3e2dd55ff0 100644
--- a/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/zh-cn/freifunk-policyrouting.po
@@ -1,28 +1,31 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-10-09 03:50+0200\n"
-"PO-Revision-Date: 2013-10-09 04:04+0200\n"
-"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2018-08-07 18:54+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid ""
"All traffic from interfaces belonging to these zones will be sent via a "
"gateway in the mesh network."
-msgstr "所有æµé‡å±žäºŽè¿™ä¸ªmesh网络区域的数æ®æµéƒ½å°†é€šè¿‡ç½‘å…³æ¥å‘é€ã€‚"
+msgstr "æ¥è‡ªå±žäºŽè¿™äº›åŒºåŸŸçš„接å£çš„所有æµé‡å°†é€šè¿‡ç½‘状网络中的网关å‘é€ã€‚"
msgid "Enable Policy Routing"
msgstr "å¯ç”¨ç­–略路由"
msgid "Fallback to mesh"
-msgstr "meshåŽå¤‡"
+msgstr "回退到网状网"
msgid "Firewall zones"
msgstr "防ç«å¢™åŒºåŸŸ"
@@ -33,12 +36,13 @@ msgid ""
"connection as a fallback. If you do not want this and instead block that "
"traffic then you should select this option."
msgstr ""
-"如果没有缺çœçš„mesh网络路由,则使用属于防ç«å¢™åŒºåŸŸå†…çš„Internet连接作为备用路由。如果您ä¸æƒ³è¦è¿™ä¸ªï¼Œè€Œæ˜¯é˜»æ­¢è¯¥æµé‡ï¼Œé‚£ä¹ˆæ‚¨åº”该选择此选项。"
+"如果没有从网状网络收到默认路由,作为åŽå¤‡ï¼Œå±žäºŽæ‰€é€‰é˜²ç«å¢™åŒºåŸŸçš„æµé‡å°†é€šè¿‡æ‚¨çš„ "
+"Internet 连接路由进行路由。如果您ä¸æƒ³è¿™æ ·ï¼Œè€Œè¦é˜»æŒ¡è¯¥æµé‡ï¼Œé‚£ä¹ˆæ‚¨åº”选择此项。"
msgid ""
"If your own gateway is not available then fallback to the mesh default "
"gateway."
-msgstr "如果您自己的网关ä¸å¯ç”¨ï¼Œåˆ™é€€å›žåˆ°mesh默认网关。"
+msgstr "如果您自己的网关ä¸å¯ç”¨ï¼Œåˆ™å›žé€€åˆ°ç½‘状网默认网关。"
msgid "Policy Routing"
msgstr "策略路由"
@@ -53,5 +57,7 @@ msgid ""
"'Ego Mode'). Your own traffic is then sent via your internet connection "
"while traffic originating from the mesh will use another gateway in the mesh."
msgstr ""
-"这些页é¢ç”¨äºŽæŸäº›é˜²ç«å¢™åŒºåŸŸè®¾ç½®ç­–略路由。这是éžå¸¸æœ‰ç”¨çš„,如果您需è¦è‡ªå·±ä½¿ç”¨è‡ªå·±çš„互è”网连接,但您ä¸æƒ³æŠŠå®ƒåˆ†äº«ç»™å…¶ä»–人(这就是为什么它也被称为“自我模å¼'"
-")。您自己的æµé‡ï¼Œé€šè¿‡æ‚¨çš„互è”网连接å‘é€ï¼Œè€Œmesh中的数æ®åŒ…将使用mesh中å¦å¤–的网关。"
+"这些页é¢å¯ç”¨äºŽä¸ºæŸäº›é˜²ç«å¢™åŒºåŸŸè®¾ç½®ç­–略路由。如果您想自己使用自己的互è”网连"
+"接,但ä¸æƒ³å’Œå…¶ä»–人共享(这就是它为什么也å¯ä»¥ç§°ä¸ºâ€œè‡ªç§æ¨¡å¼â€ï¼‰ï¼Œåˆ™è¿™ä¼šæœ‰ç”¨ã€‚您"
+"自己的æµé‡å°†é€šè¿‡æ‚¨çš„互è”网连接å‘é€å‡ºåŽ»ï¼Œè€Œæ¥è‡ªç½‘状网的æµé‡å°†ä½¿ç”¨ç½‘状网中的å¦"
+"一个网关。"
diff --git a/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po b/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po
index 58efa74c50..f5b891a968 100644
--- a/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po
+++ b/applications/luci-app-freifunk-policyrouting/po/zh-tw/freifunk-policyrouting.po
@@ -1,25 +1,34 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-10-09 03:50+0200\n"
+"PO-Revision-Date: 2018-08-07 18:54+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid ""
"All traffic from interfaces belonging to these zones will be sent via a "
"gateway in the mesh network."
-msgstr ""
+msgstr "來自屬於這些å€åŸŸçš„介é¢çš„所有æµé‡å°‡é€šéŽç¶²ç‹€ç¶²è·¯ä¸­çš„é–˜é“器傳é€ã€‚"
msgid "Enable Policy Routing"
-msgstr ""
+msgstr "啟用策略路由"
msgid "Fallback to mesh"
-msgstr ""
+msgstr "回退到網狀網"
msgid "Firewall zones"
-msgstr ""
+msgstr "防ç«ç‰†å€åŸŸ"
msgid ""
"If no default route is received from the mesh network then traffic which "
@@ -27,17 +36,19 @@ msgid ""
"connection as a fallback. If you do not want this and instead block that "
"traffic then you should select this option."
msgstr ""
+"如果沒有從網狀網路收到é è¨­è·¯ç”±ï¼Œä½œç‚ºå¾Œå‚™ï¼Œå±¬æ–¼æ‰€é¸é˜²ç«ç‰†å€åŸŸçš„æµé‡å°‡é€šéŽæ‚¨çš„ "
+"Internet 連線路由進行路由。如果您ä¸æƒ³é€™æ¨£ï¼Œè€Œè¦é˜»æ“‹è©²æµé‡ï¼Œé‚£éº¼æ‚¨æ‡‰é¸æ“‡æ­¤é …。"
msgid ""
"If your own gateway is not available then fallback to the mesh default "
"gateway."
-msgstr ""
+msgstr "如果您自己的閘é“器ä¸å¯ç”¨ï¼Œå‰‡å›žé€€åˆ°ç¶²ç‹€ç¶²é è¨­é–˜é“器。"
msgid "Policy Routing"
-msgstr ""
+msgstr "策略路由"
msgid "Strict Filtering"
-msgstr ""
+msgstr "åš´æ ¼éŽæ¿¾"
msgid ""
"These pages can be used to setup policy routing for certain firewall zones. "
@@ -46,3 +57,7 @@ msgid ""
"'Ego Mode'). Your own traffic is then sent via your internet connection "
"while traffic originating from the mesh will use another gateway in the mesh."
msgstr ""
+"這些é é¢å¯ç”¨æ–¼ç‚ºæŸäº›é˜²ç«ç‰†å€åŸŸè¨­å®šç­–略路由。如果您想自己使用自己的網際網路連"
+"接,但ä¸æƒ³å’Œå…¶ä»–人共享(這就是它為什麼也å¯ä»¥ç¨±ç‚ºâ€œè‡ªç§æ¨¡å¼â€ï¼‰ï¼Œå‰‡é€™æœƒæœ‰ç”¨ã€‚您"
+"自己的æµé‡å°‡é€šéŽæ‚¨çš„網際網路連線傳é€å‡ºåŽ»ï¼Œè€Œä¾†è‡ªç¶²ç‹€ç¶²çš„æµé‡å°‡ä½¿ç”¨ç¶²ç‹€ç¶²ä¸­çš„å¦"
+"一個閘é“器。"
diff --git a/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po b/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po
new file mode 100644
index 0000000000..73b2084a54
--- /dev/null
+++ b/applications/luci-app-fwknopd/po/zh-cn/fwknopd.po
@@ -0,0 +1,100 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 19:09+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid ""
+"Allow SPA clients to request access to services through an iptables firewall "
+"instead of just to it."
+msgstr "å…许 SPA 客户端请求通过 iptables 防ç«å¢™è®¿é—®æœåŠ¡ï¼Œè€Œä¸ä»…仅是被拦截。"
+
+msgid "Allow SPA clients to request forwarding destination by DNS name."
+msgstr "å…许 SPA 客户端用 DNS å称请求转å‘目标。"
+
+msgid "Base 64 key"
+msgstr "Base64 密钥"
+
+msgid ""
+"Define a set of ports and protocols (tcp or udp) that will be opened if a "
+"valid knock sequence is seen. If this entry is not set, fwknopd will attempt "
+"to honor any proto/port request specified in the SPA data (unless of it "
+"matches any “RESTRICT_PORTS†entries). Multiple entries are comma-separated."
+msgstr ""
+"定义一组端å£å’Œå议(TCP 或 UDP),如果看到有效的敲门(knock)åºåˆ—,则打开这些"
+"端å£å’Œå议。如果未设置此æ¡ç›®ï¼Œfwknopd å°†å°è¯•éµå®ˆ SPA æ•°æ®ä¸­æŒ‡å®šçš„任何åè®®/端"
+"å£è¯·æ±‚(除éžåŒ¹é…到了任何“RESTRICT_PORTSâ€æ¡ç›®ï¼‰ã€‚多个æ¡ç›®ä»¥é€—å·åˆ†éš”。"
+
+msgid ""
+"Define the length of time access will be granted by fwknopd through the "
+"firewall after a valid knock sequence from a source IP address. If "
+"“FW_ACCESS_TIMEOUT†is not set then the default timeout of 30 seconds will "
+"automatically be set."
+msgstr ""
+"å®šä¹‰åœ¨æº IP 地å€çš„有效敲门åºåˆ—åŽï¼Œfwknopd 授予其通过防ç«å¢™è®¿é—®çš„时间长度。如"
+"果未设置“FW_ACCESS_TIMEOUTâ€ï¼Œåˆ™å°†è‡ªåŠ¨è®¾ç½®é»˜è®¤è¶…æ—¶ 30 秒。"
+
+msgid ""
+"Define the symmetric key used for decrypting an incoming SPA packet that is "
+"encrypted by the fwknop client with Rijndael."
+msgstr ""
+"定义 Rijndael 对称密钥,将用于解密由 fwknop 客户端传入的加密 SPA æ•°æ®åŒ…。"
+
+msgid "Enable Uci/Luci control"
+msgstr "å¯ç”¨ Uci/Luci 控件"
+
+msgid "Enable config overwrite"
+msgstr "å¯ç”¨é…置覆盖"
+
+msgid "Firewall Knock Daemon"
+msgstr "Firewall Knock 守护进程"
+
+msgid "Firewall Knock Operator"
+msgstr "Firewall Knock æ“作者"
+
+msgid ""
+"Force all SPA packets to contain a real IP address within the encrypted "
+"data. This makes it impossible to use the -s command line argument on the "
+"fwknop client command line, so either -R has to be used to automatically "
+"resolve the external address (if the client behind a NAT) or the client must "
+"know the external IP and set it via the -a argument."
+msgstr ""
+"强制所有 SPA æ•°æ®åŒ…在加密数æ®ä¸­åŒ…å«çœŸå®ž IP 地å€ã€‚这使得无法在 fwknop 客户端命"
+"令行上使用 -s 命令行å‚数,因此 -R 必须用于自动解æžå¤–部地å€ï¼ˆå¦‚æžœ NAT åŽé¢çš„客"
+"户端),或客户端必须通过 -a å‚数知é“外部 IP。"
+
+msgid ""
+"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
+"seconds"
+msgstr "SPA æ•°æ®åŒ…的最大å¯æŽ¥å—年龄(秒)。默认为 120 秒"
+
+msgid "Normal Key"
+msgstr "普通密钥"
+
+msgid "Specify the ethernet interface on which fwknopd will sniff packets."
+msgstr "指定 fwknopd å°†è¦å—…探数æ®åŒ…的以太网接å£ã€‚"
+
+msgid "The base64 hmac key"
+msgstr "base64 hmac 密钥"
+
+msgid "Use ANY for any source ip"
+msgstr "å¯¹ä»»ä½•æº IP 使用 ANY"
+
+msgid ""
+"When unchecked, the config files in /etc/fwknopd will be used as is, "
+"ignoring any settings here."
+msgstr ""
+"å–消选中时,/etc/fwknopd 中的é…置文件将按原样使用,忽略此处的任何设置。"
+
+msgid "access.conf stanzas"
+msgstr "access.conf 节"
+
+msgid "fwknopd.conf config options"
+msgstr "fwknopd.conf é…置选项"
diff --git a/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po b/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po
new file mode 100644
index 0000000000..1ae9f84326
--- /dev/null
+++ b/applications/luci-app-fwknopd/po/zh-tw/fwknopd.po
@@ -0,0 +1,100 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 19:10+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid ""
+"Allow SPA clients to request access to services through an iptables firewall "
+"instead of just to it."
+msgstr "å…許 SPA å®¢æˆ¶ç«¯è«‹æ±‚é€šéŽ iptables 防ç«ç‰†è¨ªå•æœå‹™ï¼Œè€Œä¸åƒ…僅是被攔截。"
+
+msgid "Allow SPA clients to request forwarding destination by DNS name."
+msgstr "å…許 SPA 客戶端用 DNS å稱請求轉發目標。"
+
+msgid "Base 64 key"
+msgstr "Base64 金鑰"
+
+msgid ""
+"Define a set of ports and protocols (tcp or udp) that will be opened if a "
+"valid knock sequence is seen. If this entry is not set, fwknopd will attempt "
+"to honor any proto/port request specified in the SPA data (unless of it "
+"matches any “RESTRICT_PORTS†entries). Multiple entries are comma-separated."
+msgstr ""
+"定義一組埠和å”議(TCP 或 UDP),如果看到有效的敲門(knock)åºåˆ—,則開啟這些埠"
+"å’Œå”議。如果未設定此æ¢ç›®ï¼Œfwknopd 將嘗試éµå®ˆ SPA 資料中指定的任何å”è­°/端å£è«‹"
+"求(除éžåŒ¹é…到了任何“RESTRICT_PORTSâ€æ¢ç›®ï¼‰ã€‚多個æ¢ç›®ä»¥é€—號分隔。"
+
+msgid ""
+"Define the length of time access will be granted by fwknopd through the "
+"firewall after a valid knock sequence from a source IP address. If "
+"“FW_ACCESS_TIMEOUT†is not set then the default timeout of 30 seconds will "
+"automatically be set."
+msgstr ""
+"å®šç¾©åœ¨æº IP ä½å€çš„有效敲門åºåˆ—後,fwknopd 授予其通éŽé˜²ç«ç‰†è¨ªå•çš„時間長度。如"
+"果未設定“FW_ACCESS_TIMEOUTâ€ï¼Œå‰‡å°‡è‡ªå‹•è¨­å®šé è¨­è¶…時 30 秒。"
+
+msgid ""
+"Define the symmetric key used for decrypting an incoming SPA packet that is "
+"encrypted by the fwknop client with Rijndael."
+msgstr ""
+"定義 Rijndael å°ç¨±é‡‘鑰,將用於解密由 fwknop 客戶端傳入的加密 SPA 資料包。"
+
+msgid "Enable Uci/Luci control"
+msgstr "啟用 Uci/Luci 控制元件"
+
+msgid "Enable config overwrite"
+msgstr "啟用é…置覆蓋"
+
+msgid "Firewall Knock Daemon"
+msgstr "Firewall Knock 守護程å¼"
+
+msgid "Firewall Knock Operator"
+msgstr "Firewall Knock æ“作者"
+
+msgid ""
+"Force all SPA packets to contain a real IP address within the encrypted "
+"data. This makes it impossible to use the -s command line argument on the "
+"fwknop client command line, so either -R has to be used to automatically "
+"resolve the external address (if the client behind a NAT) or the client must "
+"know the external IP and set it via the -a argument."
+msgstr ""
+"強制所有 SPA 資料包在加密資料中包å«çœŸå¯¦ IP ä½å€ã€‚這使得無法在 fwknop 客戶端命"
+"令行上使用 -s 指令列引數,因此 -R 必須用於自動解æžå¤–部ä½å€ï¼ˆå¦‚æžœ NAT 後é¢çš„客"
+"戶端),æˆ–å®¢æˆ¶ç«¯å¿…é ˆé€šéŽ -a 引數知é“外部 IP。"
+
+msgid ""
+"Maximum age in seconds that an SPA packet will be accepted. defaults to 120 "
+"seconds"
+msgstr "SPA 資料包的最大å¯æŽ¥å—年齡(秒)。é è¨­ç‚º 120 秒"
+
+msgid "Normal Key"
+msgstr "普通金鑰"
+
+msgid "Specify the ethernet interface on which fwknopd will sniff packets."
+msgstr "指定 fwknopd å°‡è¦å—…探資料包的乙太網介é¢ã€‚"
+
+msgid "The base64 hmac key"
+msgstr "base64 hmac 金鑰"
+
+msgid "Use ANY for any source ip"
+msgstr "å°ä»»ä½•æº IP 使用 ANY"
+
+msgid ""
+"When unchecked, the config files in /etc/fwknopd will be used as is, "
+"ignoring any settings here."
+msgstr ""
+"å–消é¸ä¸­æ™‚,/etc/fwknopd 中的é…置檔案將按原樣使用,忽略此處的任何設定。"
+
+msgid "access.conf stanzas"
+msgstr "access.conf 節"
+
+msgid "fwknopd.conf config options"
+msgstr "fwknopd.conf é…ç½®é¸é …"
diff --git a/applications/luci-app-https_dns_proxy/Makefile b/applications/luci-app-https_dns_proxy/Makefile
new file mode 100644
index 0000000000..2ae2b80f2f
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/Makefile
@@ -0,0 +1,17 @@
+# Copyright 2017-2018 Stan Grishin (stangri@melmac.net)
+# This is free software, licensed under the GNU General Public License v3.
+
+include $(TOPDIR)/rules.mk
+
+PKG_LICENSE:=GPL-3.0+
+PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
+
+LUCI_TITLE:=HTTPS DNS Proxy Web UI
+LUCI_DESCRIPTION:=Provides Web UI for HTTPS DNS Proxy
+LUCI_DEPENDS:=+luci-mod-admin-full +https_dns_proxy
+LUCI_PKGARCH:=all
+PKG_RELEASE:=2
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua b/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua
new file mode 100644
index 0000000000..e1fd8fcb9b
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/luasrc/controller/https_dns_proxy.lua
@@ -0,0 +1,7 @@
+module("luci.controller.https_dns_proxy", package.seeall)
+function index()
+ if not nixio.fs.access("/etc/config/https_dns_proxy") then
+ return
+ end
+ entry({"admin", "services", "https_dns_proxy"}, cbi("https_dns_proxy"), _("HTTPS DNS Proxy"))
+end
diff --git a/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua b/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua
new file mode 100644
index 0000000000..61511a4130
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/luasrc/model/cbi/https_dns_proxy.lua
@@ -0,0 +1,53 @@
+local uci = require("luci.model.uci").cursor()
+
+m = Map("https_dns_proxy", translate("HTTPS DNS Proxy Settings"))
+m.template="cbi/map"
+
+s3 = m:section(TypedSection, "https_dns_proxy", translate("Instances"))
+s3.template = "cbi/tblsection"
+s3.sortable = false
+s3.anonymous = true
+s3.addremove = true
+
+prov = s3:option(ListValue, "url_prefix", translate("Provider"))
+prov:value("https://cloudflare-dns.com/dns-query?ct=application/dns-json&","Cloudflare")
+prov:value("https://dns.google.com/resolve?","Google")
+prov.write = function(self, section, value)
+ if value and value:match("cloudflare") then
+ uci:set("https_dns_proxy", section, "bootstrap_dns", "1.1.1.1,1.0.0.1")
+ uci:set("https_dns_proxy", section, "url_prefix", "https://cloudflare-dns.com/dns-query?ct=application/dns-json&")
+ else
+ uci:set("https_dns_proxy", section, "bootstrap_dns", "8.8.8.8,8.8.4.4")
+ uci:set("https_dns_proxy", section, "url_prefix", "https://dns.google.com/resolve?")
+ end
+ uci:set("https_dns_proxy", section, "user", "nobody")
+ uci:set("https_dns_proxy", section, "group", "nogroup")
+ uci:save("https_dns_proxy")
+end
+
+la = s3:option(Value, "listen_addr", translate("Listen address"))
+la.value = "127.0.0.1"
+la.rmempty = true
+
+lp = s3:option(Value, "listen_port", translate("Listen port"))
+lp.datatype = "port"
+lp.placeholder = "5053"
+lp.rmempty = true
+
+-- user = s3:option(Value, "user", translate("User name"))
+-- user.placeholder = "nobody"
+-- user.rmempty = true
+
+-- group = s3:option(Value, "group", translate("Group name"))
+-- group.placeholder = "nogroup"
+-- group.rmempty = true
+
+sa = s3:option(Value, "subnet_addr", translate("Subnet address"))
+sa.datatype = "ip4prefix"
+sa.rmempty = true
+
+ps = s3:option(Value, "proxy_server", translate("Proxy server"))
+-- ps.datatype = "or(ipaddr,hostname)"
+ps.rmempty = true
+
+return m
diff --git a/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
new file mode 100644
index 0000000000..c292e79325
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/po/templates/https_dns_proxy.pot
@@ -0,0 +1,32 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+msgid "Group name"
+msgstr ""
+
+msgid "HTTPS DNS Proxy"
+msgstr ""
+
+msgid "HTTPS DNS Proxy Settings"
+msgstr ""
+
+msgid "Instances"
+msgstr ""
+
+msgid "Listen address"
+msgstr ""
+
+msgid "Listen port"
+msgstr ""
+
+msgid "Provider"
+msgstr ""
+
+msgid "Proxy server"
+msgstr ""
+
+msgid "Subnet address"
+msgstr ""
+
+msgid "User name"
+msgstr ""
diff --git a/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy b/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy
new file mode 100644
index 0000000000..7800af701e
--- /dev/null
+++ b/applications/luci-app-https_dns_proxy/root/etc/uci-defaults/40_luci-https_dns_proxy
@@ -0,0 +1,10 @@
+#!/bin/sh
+uci -q batch <<-EOF >/dev/null
+ delete ucitrack.@https_dns_proxy[-1]
+ add ucitrack https_dns_proxy
+ set ucitrack.@template[-1].init=https_dns_proxy
+ commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/applications/luci-app-meshwizard/po/zh-cn/meshwizard.po b/applications/luci-app-meshwizard/po/zh-cn/meshwizard.po
index b04c880183..11c7559292 100644
--- a/applications/luci-app-meshwizard/po/zh-cn/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/zh-cn/meshwizard.po
@@ -1,23 +1,26 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-09-24 18:01+0200\n"
-"PO-Revision-Date: 2014-03-25 04:25+0200\n"
-"Last-Translator: hewenhao <hewenhao2008@sina.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2018-08-07 19:18+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Activate or deactivate IPv6 config globally."
-msgstr "å¯ç”¨æˆ–åœç”¨å…¨çƒIPv6设置"
+msgstr "å¯ç”¨æˆ–åœç”¨å…¨å±€ IPv6 设置"
msgid "Channel"
-msgstr "频é“"
+msgstr "ä¿¡é“"
msgid "Check this to protect your LAN from other nodes or clients"
msgstr "选择此项,隔离其他节点或客户端的攻击æ¥ä¿æŠ¤æ‚¨çš„局域网"
@@ -32,26 +35,26 @@ msgid "DHCP IP range"
msgstr "DHCP IP 范围"
msgid "DHCP will automatically assign ip addresses to clients"
-msgstr "DHCP将自动给客户端分é…IP地å€"
+msgstr "DHCP å°†è‡ªåŠ¨ç»™å®¢æˆ·ç«¯åˆ†é… IP 地å€"
msgid "Enable DHCP"
-msgstr "å¯åŠ¨DHCP"
+msgstr "å¯åŠ¨ DHCP"
msgid "Enable RA"
-msgstr "å¯ç”¨RA"
+msgstr "å¯ç”¨ RA"
msgid "Enabled"
msgstr "å¯ç”¨"
msgid "General Settings"
-msgstr "总体设置"
+msgstr "常规设置"
msgid "IPv6 Settings"
-msgstr "IPv6设置"
+msgstr "IPv6 设置"
msgid ""
"If this is selected then config is cleaned before setting new config options."
-msgstr "如果此项被选中,在设置新选项之å‰ï¼Œé…置将被清空。"
+msgstr "如果选中此项,在设置新选项之å‰ï¼Œé…置将被清空。"
msgid "Interfaces"
msgstr "ç•Œé¢"
@@ -60,30 +63,29 @@ msgid "Mesh IP address"
msgstr "Mesh IP 地å€"
msgid "Mesh IPv6 address"
-msgstr "Mesh IPv6地å€"
+msgstr "Mesh IPv6 地å€"
msgid "Mesh Wizard"
-msgstr "Mesh 导引"
+msgstr "Mesh å‘导"
-#, fuzzy
msgid ""
"Note: this will set up this interface for mesh operation, i.e. add it to "
"zone 'freifunk' and enable olsr."
-msgstr "注æ„:这将为meshæ“作建立一个接å£ï¼Œå¦‚:增加到‘freifunk’区域并使能olsr"
+msgstr ""
+"注æ„:这将为 mesh æ“作建立一个接å£ï¼Œå¦‚:添加到“freifunkâ€åŒºåŸŸå¹¶å¯ç”¨ olsr"
msgid "Protect LAN"
-msgstr "ä¿æŠ¤LANå£"
+msgstr "ä¿æŠ¤ LAN å£"
msgid ""
"Select this to allow others to use your connection to access the internet."
-msgstr "选择这项æ¥å…许其它程åºç”¨æ‚¨è¿™ä¸ªè¿žæŽ¥æ¥æŽ¥å…¥å› ç‰¹ç½‘"
+msgstr "选择此项以å…许其他人使用您的连接访问互è”网。"
-#, fuzzy
msgid "Send router advertisements on this device."
-msgstr "在这个设备上å‘é€è·¯ç”±å¹¿æ’­"
+msgstr "在此设备上å‘é€è·¯ç”±å¹¿æ’­ã€‚"
msgid "Share your internet connection"
-msgstr "分享您的Internet连接"
+msgstr "分享您的互è”网连接"
msgid ""
"The IP range from which clients are assigned ip addresses (e.g. "
@@ -91,36 +93,41 @@ msgid ""
"will be announced as HNA. Any other range will use NAT. If left empty then "
"the defaults from the community profile will be used."
msgstr ""
+"给客户端分é…çš„ IP 地å€èŒƒå›´ï¼ˆå¦‚ 10.1.2.1/28)。如果此范围ä½äºŽæ‚¨çš„网状网络范围"
+"内,那么它将被通告为 HNA。任何其他范围将使用 NAT。如果留空,则将使用社区个人"
+"资料中的默认值。"
msgid "The given IP address is not inside the mesh network range"
-msgstr ""
+msgstr "给定的 IP 地å€ä¸åœ¨ç½‘状网络范围内"
msgid ""
"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
"has to be registered at your local community."
msgstr ""
+"这是唯一 IPv6 地å€ï¼Œä»¥ CIDR 表示(例如 2001:1:2:3::1/64),必须在您的当地社区"
+"注册。"
msgid ""
"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
"registered at your local community."
-msgstr ""
+msgstr "这是网状网中的唯一地å€ï¼ˆä¾‹å¦‚ 10.1.1.1),必须在您的当地社区注册。"
msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr "这将会在接入点模å¼è®¾ç½®ä¸€ä¸ªæ–°çš„虚拟无线网络接å£"
+msgstr "这将在接入点模å¼ä¸‹è®¾ç½®æ–°çš„虚拟无线接å£ã€‚"
msgid ""
"This wizard will assist you in setting up your router for Freifunk or "
"another similar wireless community network."
-msgstr ""
+msgstr "该å‘导将帮助您为 Freifunk 或其他类似的无线社区网络设置路由器。"
msgid "Virtual Access Point (VAP)"
-msgstr "虚拟接入点"
+msgstr "虚拟接入点(VAP)"
msgid "Wizard"
-msgstr ""
+msgstr "å‘导"
msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
+msgstr "您的设备和相邻节点必须使用相åŒçš„ä¿¡é“。"
msgid "recommended"
msgstr "推è"
diff --git a/applications/luci-app-meshwizard/po/zh-tw/meshwizard.po b/applications/luci-app-meshwizard/po/zh-tw/meshwizard.po
index a4d29e8c10..d52500c785 100644
--- a/applications/luci-app-meshwizard/po/zh-tw/meshwizard.po
+++ b/applications/luci-app-meshwizard/po/zh-tw/meshwizard.po
@@ -1,81 +1,91 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-24 18:01+0200\n"
+"PO-Revision-Date: 2018-08-07 19:18+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Activate or deactivate IPv6 config globally."
-msgstr ""
+msgstr "啟用或åœç”¨å…¨åŸŸæ€§ IPv6 設定"
msgid "Channel"
-msgstr ""
+msgstr "通é“"
msgid "Check this to protect your LAN from other nodes or clients"
-msgstr ""
+msgstr "é¸æ“‡æ­¤é …,隔離其他節點或客戶端的攻擊來ä¿è­·æ‚¨çš„å€åŸŸç¶²"
msgid "Cleanup config"
-msgstr ""
+msgstr "清空é…ç½®"
msgid "Configure this interface"
-msgstr ""
+msgstr "é…置當å‰ä»‹é¢"
msgid "DHCP IP range"
-msgstr ""
+msgstr "DHCP IP 範åœ"
msgid "DHCP will automatically assign ip addresses to clients"
-msgstr ""
+msgstr "DHCP å°‡è‡ªå‹•çµ¦å®¢æˆ¶ç«¯åˆ†é… IP ä½å€"
msgid "Enable DHCP"
-msgstr ""
+msgstr "å•Ÿå‹• DHCP"
msgid "Enable RA"
-msgstr ""
+msgstr "啟用 RA"
msgid "Enabled"
-msgstr ""
+msgstr "啟用"
msgid "General Settings"
-msgstr ""
+msgstr "常è¦è¨­å®š"
msgid "IPv6 Settings"
-msgstr ""
+msgstr "IPv6 設定"
msgid ""
"If this is selected then config is cleaned before setting new config options."
-msgstr ""
+msgstr "如果é¸ä¸­æ­¤é …,在設定新é¸é …之å‰ï¼Œé…置將被清空。"
msgid "Interfaces"
-msgstr ""
+msgstr "介é¢"
msgid "Mesh IP address"
-msgstr ""
+msgstr "Mesh IP ä½å€"
msgid "Mesh IPv6 address"
-msgstr ""
+msgstr "Mesh IPv6 ä½å€"
msgid "Mesh Wizard"
-msgstr ""
+msgstr "Mesh 嚮導"
msgid ""
"Note: this will set up this interface for mesh operation, i.e. add it to "
"zone 'freifunk' and enable olsr."
msgstr ""
+"注æ„:這將為 mesh æ“作建立一個介é¢ï¼Œå¦‚:新增到“freifunkâ€å€åŸŸä¸¦å•Ÿç”¨ olsr"
msgid "Protect LAN"
-msgstr ""
+msgstr "ä¿è­· LAN å£"
msgid ""
"Select this to allow others to use your connection to access the internet."
-msgstr ""
+msgstr "é¸æ“‡æ­¤é …以å…許其他人使用您的連線訪å•ç¶²éš›ç¶²è·¯ã€‚"
msgid "Send router advertisements on this device."
-msgstr ""
+msgstr "在此è£ç½®ä¸Šå‚³é€è·¯ç”±å»£æ’­ã€‚"
msgid "Share your internet connection"
-msgstr ""
+msgstr "分享您的網際網路連線"
msgid ""
"The IP range from which clients are assigned ip addresses (e.g. "
@@ -83,36 +93,41 @@ msgid ""
"will be announced as HNA. Any other range will use NAT. If left empty then "
"the defaults from the community profile will be used."
msgstr ""
+"給客戶端分é…çš„ IP ä½å€ç¯„åœï¼ˆå¦‚ 10.1.2.1/28)。如果此範åœä½æ–¼æ‚¨çš„網狀網路範åœ"
+"內,那麼它將被宣告為 HNA。任何其他範åœå°‡ä½¿ç”¨ NAT。如果留空,則將使用社群個人"
+"資料中的é è¨­å€¼ã€‚"
msgid "The given IP address is not inside the mesh network range"
-msgstr ""
+msgstr "給定的 IP ä½å€ä¸åœ¨ç¶²ç‹€ç¶²è·¯ç¯„åœå…§"
msgid ""
"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
"has to be registered at your local community."
msgstr ""
+"這是唯一 IPv6 ä½å€ï¼Œä»¥ CIDR 表示(例如 2001:1:2:3::1/64),必須在您的當地社群"
+"註冊。"
msgid ""
"This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
"registered at your local community."
-msgstr ""
+msgstr "這是網狀網中的唯一ä½å€ï¼ˆä¾‹å¦‚ 10.1.1.1),必須在您的當地社群註冊。"
msgid "This will setup a new virtual wireless interface in Access Point mode."
-msgstr ""
+msgstr "這將在接入點模å¼ä¸‹è¨­å®šæ–°çš„虛擬無線介é¢ã€‚"
msgid ""
"This wizard will assist you in setting up your router for Freifunk or "
"another similar wireless community network."
-msgstr ""
+msgstr "該å‘導將幫助您為 Freifunk 或其他類似的無線社群網路設定路由器。"
msgid "Virtual Access Point (VAP)"
-msgstr ""
+msgstr "虛擬接入點(VAP)"
msgid "Wizard"
-msgstr ""
+msgstr "嚮導"
msgid "Your device and neighbouring nodes have to use the same channel."
-msgstr ""
+msgstr "您的è£ç½®å’Œç›¸é„°ç¯€é»žå¿…須使用相åŒçš„通é“。"
msgid "recommended"
-msgstr ""
+msgstr "推薦"
diff --git a/applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua b/applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua
index 067d08cf0a..9dcc527a31 100644
--- a/applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua
+++ b/applications/luci-app-minidlna/luasrc/model/cbi/minidlna.lua
@@ -15,7 +15,7 @@ s.anonymous = true
s:tab("general", translate("General Settings"))
s:tab("advanced", translate("Advanced Settings"))
-o = s:taboption("general", Flag, "enabled", translate("Enable:"))
+o = s:taboption("general", Flag, "enabled", translate("Enable"))
o.rmempty = false
function o.cfgvalue(self, section)
@@ -34,13 +34,13 @@ function o.write(self, section, value)
return Flag.write(self, section, value)
end
-o = s:taboption("general", Value, "port", translate("Port:"),
+o = s:taboption("general", Value, "port", translate("Port"),
translate("Port for HTTP (descriptions, SOAP, media transfer) traffic."))
o.datatype = "port"
o.default = 8200
-o = s:taboption("general", Value, "interface", translate("Interfaces:"),
+o = s:taboption("general", Value, "interface", translate("Interfaces"),
translate("Network interfaces to serve."))
o.template = "cbi/network_ifacelist"
@@ -69,59 +69,59 @@ function o.write(self, section, value)
end
-o = s:taboption("general", Value, "friendly_name", translate("Friendly name:"),
+o = s:taboption("general", Value, "friendly_name", translate("Friendly name"),
translate("Set this if you want to customize the name that shows up on your clients."))
o.rmempty = true
o.placeholder = "OpenWrt DLNA Server"
-o = s:taboption("advanced", Value, "db_dir", translate("Database directory:"),
+o = s:taboption("advanced", Value, "db_dir", translate("Database directory"),
translate("Set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache."))
o.rmempty = true
o.placeholder = "/var/cache/minidlna"
-o = s:taboption("advanced", Value, "log_dir", translate("Log directory:"),
+o = s:taboption("advanced", Value, "log_dir", translate("Log directory"),
translate("Set this if you would like to specify the directory where you want MiniDLNA to store its log file."))
o.rmempty = true
o.placeholder = "/var/log"
-s:taboption("advanced", Flag, "inotify", translate("Enable inotify:"),
+s:taboption("advanced", Flag, "inotify", translate("Enable inotify"),
translate("Set this to enable inotify monitoring to automatically discover new files."))
-s:taboption("advanced", Flag, "enable_tivo", translate("Enable TIVO:"),
+s:taboption("advanced", Flag, "enable_tivo", translate("Enable TIVO"),
translate("Set this to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO."))
o.rmempty = true
-s:taboption("advanced", Flag, "wide_links", translate("Allow wide links:"),
+s:taboption("advanced", Flag, "wide_links", translate("Allow wide links"),
translate("Set this to allow serving content outside the media root (via symlinks)."))
o.rmempty = true
-o = s:taboption("advanced", Flag, "strict_dlna", translate("Strict to DLNA standard:"),
+o = s:taboption("advanced", Flag, "strict_dlna", translate("Strict to DLNA standard"),
translate("Set this to strictly adhere to DLNA standards. This will allow server-side downscaling of very large JPEG images, which may hurt JPEG serving performance on (at least) Sony DLNA products."))
o.rmempty = true
-o = s:taboption("advanced", Value, "presentation_url", translate("Presentation URL:"))
+o = s:taboption("advanced", Value, "presentation_url", translate("Presentation URL"))
o.rmempty = true
o.placeholder = "http://192.168.1.1/"
-o = s:taboption("advanced", Value, "notify_interval", translate("Notify interval:"),
+o = s:taboption("advanced", Value, "notify_interval", translate("Notify interval"),
translate("Notify interval in seconds."))
o.datatype = "uinteger"
o.placeholder = 900
-o = s:taboption("advanced", Value, "serial", translate("Announced serial number:"),
+o = s:taboption("advanced", Value, "serial", translate("Announced serial number"),
translate("Serial number the miniDLNA daemon will report to clients in its XML description."))
o.placeholder = "12345678"
-s:taboption("advanced", Value, "model_number", translate("Announced model number:"),
+s:taboption("advanced", Value, "model_number", translate("Announced model number"),
translate("Model number the miniDLNA daemon will report to clients in its XML description."))
o.placholder = "1"
-o = s:taboption("advanced", Value, "minissdpsocket", translate("miniSSDP socket:"),
+o = s:taboption("advanced", Value, "minissdpsocket", translate("miniSSDP socket"),
translate("Specify the path to the MiniSSDPd socket."))
o.rmempty = true
o.placeholder = "/var/run/minissdpd.sock"
-o = s:taboption("general", ListValue, "root_container", translate("Root container:"))
+o = s:taboption("general", ListValue, "root_container", translate("Root container"))
o:value(".", translate("Standard container"))
o:value("B", translate("Browse directory"))
o:value("M", translate("Music"))
@@ -129,11 +129,11 @@ o:value("V", translate("Video"))
o:value("P", translate("Pictures"))
-s:taboption("general", DynamicList, "media_dir", translate("Media directories:"),
+s:taboption("general", DynamicList, "media_dir", translate("Media directories"),
translate("Set this to the directory you want scanned. If you want to restrict the directory to a specific content type, you can prepend the type ('A' for audio, 'V' for video, 'P' for images), followed by a comma, to the directory (eg. A,/mnt/media/Music). Multiple directories can be specified."))
-o = s:taboption("general", DynamicList, "album_art_names", translate("Album art names:"),
+o = s:taboption("general", DynamicList, "album_art_names", translate("Album art names"),
translate("This is a list of file names to check for when searching for album art."))
o.rmempty = true
o.placeholder = "Cover.jpg"
diff --git a/applications/luci-app-minidlna/po/ca/minidlna.po b/applications/luci-app-minidlna/po/ca/minidlna.po
index dadcf04aeb..93ba90fad7 100644
--- a/applications/luci-app-minidlna/po/ca/minidlna.po
+++ b/applications/luci-app-minidlna/po/ca/minidlna.po
@@ -14,16 +14,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ajusts avançats"
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -32,32 +32,32 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
-msgstr "Habilita TIVO:"
+msgid "Enable"
+msgstr "Habilita"
-msgid "Enable inotify:"
-msgstr "Habilita inotify:"
+msgid "Enable TIVO"
+msgstr "Habilita TIVO"
-msgid "Enable:"
-msgstr "Habilita:"
+msgid "Enable inotify"
+msgstr "Habilita inotify"
-msgid "Friendly name:"
-msgstr "Nom amistós:"
+msgid "Friendly name"
+msgstr "Nom amistós"
msgid "General Settings"
msgstr "Ajusts generals"
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr "Interfícies"
-msgid "Log directory:"
-msgstr "Directori de registre:"
+msgid "Log directory"
+msgstr "Directori de registre"
-msgid "Media directories:"
-msgstr "Directoris de medis:"
+msgid "Media directories"
+msgstr "Directoris de medis"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -75,25 +75,25 @@ msgstr "Música"
msgid "Network interfaces to serve."
msgstr ""
+msgid "Notify interval"
+msgstr "Interval de notificació"
+
msgid "Notify interval in seconds."
msgstr "Interval de notificació en segons."
-msgid "Notify interval:"
-msgstr "Interval de notificació:"
-
msgid "Pictures"
msgstr "Imatges"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port de tràfic HTTP (descripcions, SOAP, transferència de medis)"
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -147,7 +147,7 @@ msgstr "Especifiqueu la ruta a l'endoll de MiniSSDPd."
msgid "Standard container"
msgstr "Contenidor estàndard"
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -170,5 +170,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "Estat de miniDLNA"
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/cs/minidlna.po b/applications/luci-app-minidlna/po/cs/minidlna.po
index f4cbd76ec0..ca07599200 100644
--- a/applications/luci-app-minidlna/po/cs/minidlna.po
+++ b/applications/luci-app-minidlna/po/cs/minidlna.po
@@ -14,16 +14,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr "PokroÄilé nastavení"
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -32,32 +32,32 @@ msgstr "Procházet adresář"
msgid "Collecting data..."
msgstr "ShromažÄování dat ..."
-msgid "Database directory:"
-msgstr "Adresář databáze:"
+msgid "Database directory"
+msgstr "Adresář databáze"
-msgid "Enable TIVO:"
-msgstr "Povolit TIVO:"
+msgid "Enable"
+msgstr "Povolit"
-msgid "Enable inotify:"
-msgstr "Povolit inotify:"
+msgid "Enable TIVO"
+msgstr "Povolit TIVO"
-msgid "Enable:"
-msgstr "Povolit:"
+msgid "Enable inotify"
+msgstr "Povolit inotify"
-msgid "Friendly name:"
-msgstr "Popisek:"
+msgid "Friendly name"
+msgstr "Popisek"
msgid "General Settings"
msgstr "Obecné nastavení"
-msgid "Interfaces:"
-msgstr "Rozhraní:"
+msgid "Interfaces"
+msgstr "Rozhraní"
-msgid "Log directory:"
-msgstr "Log adresář:"
+msgid "Log directory"
+msgstr "Log adresář"
-msgid "Media directories:"
-msgstr "Media adresáře:"
+msgid "Media directories"
+msgstr "Media adresáře"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -77,26 +77,26 @@ msgstr "Hudba"
msgid "Network interfaces to serve."
msgstr ""
+msgid "Notify interval"
+msgstr "NotifikaÄní interval"
+
msgid "Notify interval in seconds."
msgstr "NotifikaÄní interval v sekundách."
-msgid "Notify interval:"
-msgstr "NotifikaÄní interval:"
-
msgid "Pictures"
msgstr "Obrázky"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port pro HTTP (popisy, SOAP, přenos médií) provoz."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "PrezentaÄní URL:"
+msgid "Presentation URL"
+msgstr "PrezentaÄní URL"
-msgid "Root container:"
-msgstr "Kořenový/root kontejner:"
+msgid "Root container"
+msgstr "Kořenový/root kontejner"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -149,8 +149,8 @@ msgstr ""
msgid "Standard container"
msgstr "Standardní kontejner"
-msgid "Strict to DLNA standard:"
-msgstr "Striktně se držet standardu DLNA:"
+msgid "Strict to DLNA standard"
+msgstr "Striktně se držet standardu DLNA"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -174,5 +174,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "Stav miniDLNA"
-msgid "miniSSDP socket:"
-msgstr "miniSSDP socket:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP socket"
diff --git a/applications/luci-app-minidlna/po/de/minidlna.po b/applications/luci-app-minidlna/po/de/minidlna.po
index d001696874..34914034dc 100644
--- a/applications/luci-app-minidlna/po/de/minidlna.po
+++ b/applications/luci-app-minidlna/po/de/minidlna.po
@@ -14,17 +14,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Erweiterte Einstellungen"
-msgid "Album art names:"
-msgstr "Dateinamen für Cover-Bilder:"
+msgid "Album art names"
+msgstr "Dateinamen für Cover-Bilder"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Angekündigte Modellnummer:"
+msgid "Announced model number"
+msgstr "Angekündigte Modellnummer"
-msgid "Announced serial number:"
-msgstr "Angekündigte Seriennummer:"
+msgid "Announced serial number"
+msgstr "Angekündigte Seriennummer"
msgid "Browse directory"
msgstr "Browse-Verzeichnis"
@@ -32,32 +32,32 @@ msgstr "Browse-Verzeichnis"
msgid "Collecting data..."
msgstr "Sammle Daten..."
-msgid "Database directory:"
-msgstr "Datenbankverzeichnis:"
+msgid "Database directory"
+msgstr "Datenbankverzeichnis"
-msgid "Enable TIVO:"
-msgstr "TIVO aktivieren:"
+msgid "Enable"
+msgstr "Aktivieren"
-msgid "Enable inotify:"
-msgstr "Inotify aktivieren:"
+msgid "Enable TIVO"
+msgstr "TIVO aktivieren"
-msgid "Enable:"
-msgstr "Aktivieren:"
+msgid "Enable inotify"
+msgstr "Inotify aktivieren"
-msgid "Friendly name:"
-msgstr "Spitzname:"
+msgid "Friendly name"
+msgstr "Spitzname"
msgid "General Settings"
msgstr "Allgemeine Einstellungen"
-msgid "Interfaces:"
-msgstr "Schnittstellen:"
+msgid "Interfaces"
+msgstr "Schnittstellen"
-msgid "Log directory:"
-msgstr "Protokollverzeichnis:"
+msgid "Log directory"
+msgstr "Protokollverzeichnis"
-msgid "Media directories:"
-msgstr "Medienverzeichnisse:"
+msgid "Media directories"
+msgstr "Medienverzeichnisse"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -79,26 +79,26 @@ msgstr "Musik"
msgid "Network interfaces to serve."
msgstr "Zu bedienende Netzwerkschnittstellen."
+msgid "Notify interval"
+msgstr "Ankündigunsintervall"
+
msgid "Notify interval in seconds."
msgstr "Ankündigungsinterval in Sekunden."
-msgid "Notify interval:"
-msgstr "Ankündigunsintervall"
-
msgid "Pictures"
msgstr "Bilder"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port für HTTP-Verkehr (Beschreibungen, SOAP, Mediendaten)."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "Präsentations-URL:"
+msgid "Presentation URL"
+msgstr "Präsentations-URL"
-msgid "Root container:"
-msgstr "Root-Container:"
+msgid "Root container"
+msgstr "Root-Container"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -169,8 +169,8 @@ msgstr "Spezifiziert den Pfad zur MiniSSDPd-Socket-Datei."
msgid "Standard container"
msgstr "Standard-Container"
-msgid "Strict to DLNA standard:"
-msgstr "Stikt nach DLNA-Standard:"
+msgid "Strict to DLNA standard"
+msgstr "Stikt nach DLNA-Standard"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -196,8 +196,8 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "miniDLNA-Status"
-msgid "miniSSDP socket:"
-msgstr "miniSSDP-Socket:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP-Socket"
#~ msgid "Network interfaces to serve, comma delimited list."
#~ msgstr ""
diff --git a/applications/luci-app-minidlna/po/el/minidlna.po b/applications/luci-app-minidlna/po/el/minidlna.po
index d319afd238..f08917e5c5 100644
--- a/applications/luci-app-minidlna/po/el/minidlna.po
+++ b/applications/luci-app-minidlna/po/el/minidlna.po
@@ -11,16 +11,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -29,31 +29,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -72,25 +72,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -144,7 +144,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -167,5 +167,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/en/minidlna.po b/applications/luci-app-minidlna/po/en/minidlna.po
index ca5bc3b593..7339fdcd6f 100644
--- a/applications/luci-app-minidlna/po/en/minidlna.po
+++ b/applications/luci-app-minidlna/po/en/minidlna.po
@@ -11,17 +11,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
-msgstr "Album art names:"
+msgid "Album art names"
+msgstr "Album art names"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Announced model number:"
+msgid "Announced model number"
+msgstr "Announced model number"
-msgid "Announced serial number:"
-msgstr "Announced serial number:"
+msgid "Announced serial number"
+msgstr "Announced serial number"
msgid "Browse directory"
msgstr "Browse directory"
@@ -29,32 +29,32 @@ msgstr "Browse directory"
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
-msgstr "Database directory:"
+msgid "Database directory"
+msgstr "Database directory"
-msgid "Enable TIVO:"
-msgstr "Enable TIVO:"
+msgid "Enable"
+msgstr "Enable"
-msgid "Enable inotify:"
-msgstr "Enable inotify:"
+msgid "Enable TIVO"
+msgstr "Enable TIVO"
-msgid "Enable:"
-msgstr "Enable:"
+msgid "Enable inotify"
+msgstr "Enable inotify"
-msgid "Friendly name:"
-msgstr "Friendly name:"
+msgid "Friendly name"
+msgstr "Friendly name"
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
-msgstr "Interfaces:"
+msgid "Interfaces"
+msgstr "Interfaces"
-msgid "Log directory:"
-msgstr "Log directory:"
+msgid "Log directory"
+msgstr "Log directory"
-msgid "Media directories:"
-msgstr "Media directories:"
+msgid "Media directories"
+msgstr "Media directories"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -76,26 +76,26 @@ msgstr "Music"
msgid "Network interfaces to serve."
msgstr ""
+msgid "Notify interval"
+msgstr "Notify interval"
+
msgid "Notify interval in seconds."
msgstr "Notify interval in seconds."
-msgid "Notify interval:"
-msgstr "Notify interval:"
-
msgid "Pictures"
msgstr "Pictures"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port for HTTP (descriptions, SOAP, media transfer) traffic."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "Presentation URL:"
+msgid "Presentation URL"
+msgstr "Presentation URL"
-msgid "Root container:"
-msgstr "Root container:"
+msgid "Root container"
+msgstr "Root container"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -165,8 +165,8 @@ msgstr "Specify the path to the MiniSSDPd socket."
msgid "Standard container"
msgstr "Standard container"
-msgid "Strict to DLNA standard:"
-msgstr "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
+msgstr "Strict to DLNA standard"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -188,8 +188,8 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
-msgstr "miniSSDP socket:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP socket"
#~ msgid "Network interfaces to serve, comma delimited list."
#~ msgstr "Network interfaces to serve, comma delimited list."
diff --git a/applications/luci-app-minidlna/po/es/minidlna.po b/applications/luci-app-minidlna/po/es/minidlna.po
index f71e9a2b9e..44e7097cb5 100644
--- a/applications/luci-app-minidlna/po/es/minidlna.po
+++ b/applications/luci-app-minidlna/po/es/minidlna.po
@@ -14,17 +14,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Configuración avanzada"
-msgid "Album art names:"
-msgstr "Imágenes de álbumes:"
+msgid "Album art names"
+msgstr "Imágenes de álbumes"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Número de modelo declarado:"
+msgid "Announced model number"
+msgstr "Número de modelo declarado"
-msgid "Announced serial number:"
-msgstr "Número de serie declarado:"
+msgid "Announced serial number"
+msgstr "Número de serie declarado"
msgid "Browse directory"
msgstr "Ver directorio"
@@ -32,32 +32,32 @@ msgstr "Ver directorio"
msgid "Collecting data..."
msgstr "Recopilando información..."
-msgid "Database directory:"
-msgstr "Directorio de la base de datos:"
+msgid "Database directory"
+msgstr "Directorio de la base de datos"
-msgid "Enable TIVO:"
-msgstr "Activar TIVO:"
+msgid "Enable"
+msgstr "Activar"
-msgid "Enable inotify:"
-msgstr "Activar inotify:"
+msgid "Enable TIVO"
+msgstr "Activar TIVO"
-msgid "Enable:"
-msgstr "Activar:"
+msgid "Enable inotify"
+msgstr "Activar inotify"
-msgid "Friendly name:"
-msgstr "Nombre amigable:"
+msgid "Friendly name"
+msgstr "Nombre amigable"
msgid "General Settings"
msgstr "Configuración general"
-msgid "Interfaces:"
-msgstr "Interfaces:"
+msgid "Interfaces"
+msgstr "Interfaces"
-msgid "Log directory:"
-msgstr "Directorio de registro:"
+msgid "Log directory"
+msgstr "Directorio de registro"
-msgid "Media directories:"
-msgstr "Directorios de medios:"
+msgid "Media directories"
+msgstr "Directorios de medios"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -78,27 +78,27 @@ msgstr "Música"
msgid "Network interfaces to serve."
msgstr "Interfaces de red a usar."
+msgid "Notify interval"
+msgstr "Intervalo de notificación"
+
msgid "Notify interval in seconds."
msgstr "Intervalo de notificación en segundos."
-msgid "Notify interval:"
-msgstr "Intervalo de notificación:"
-
msgid "Pictures"
msgstr "Imágenes"
+msgid "Port"
+msgstr "Puerto"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
"Puerto para tráfico HTTP (descripciones, SOAP y transferencia de medios)."
-msgid "Port:"
-msgstr "Puerto:"
-
-msgid "Presentation URL:"
-msgstr "URL de presentación:"
+msgid "Presentation URL"
+msgstr "URL de presentación"
-msgid "Root container:"
-msgstr "Raíz de contenidos:"
+msgid "Root container"
+msgstr "Raíz de contenidos"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -162,8 +162,8 @@ msgstr "Camino al socket de MiniSSDPd."
msgid "Standard container"
msgstr "Contenedor estándar"
-msgid "Strict to DLNA standard:"
-msgstr "Ceñirse al estándar DLNA:"
+msgid "Strict to DLNA standard"
+msgstr "Ceñirse al estándar DLNA"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -187,5 +187,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "Estado de miniDLNA"
-msgid "miniSSDP socket:"
-msgstr "Socket de miniSSDP:"
+msgid "miniSSDP socket"
+msgstr "Socket de miniSSDP"
diff --git a/applications/luci-app-minidlna/po/fr/minidlna.po b/applications/luci-app-minidlna/po/fr/minidlna.po
index 498dea6c80..4bb4e5ac91 100644
--- a/applications/luci-app-minidlna/po/fr/minidlna.po
+++ b/applications/luci-app-minidlna/po/fr/minidlna.po
@@ -11,16 +11,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -29,31 +29,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -72,25 +72,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -144,7 +144,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -167,5 +167,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/he/minidlna.po b/applications/luci-app-minidlna/po/he/minidlna.po
index d319afd238..f08917e5c5 100644
--- a/applications/luci-app-minidlna/po/he/minidlna.po
+++ b/applications/luci-app-minidlna/po/he/minidlna.po
@@ -11,16 +11,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -29,31 +29,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -72,25 +72,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -144,7 +144,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -167,5 +167,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/hu/minidlna.po b/applications/luci-app-minidlna/po/hu/minidlna.po
index c1371afd9e..cb86dfcf92 100644
--- a/applications/luci-app-minidlna/po/hu/minidlna.po
+++ b/applications/luci-app-minidlna/po/hu/minidlna.po
@@ -14,17 +14,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Haladó beállítások"
-msgid "Album art names:"
-msgstr "Borító album nevek:"
+msgid "Album art names"
+msgstr "Borító album nevek"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Közölt modellszám:"
+msgid "Announced model number"
+msgstr "Közölt modellszám"
-msgid "Announced serial number:"
-msgstr "Közölt sorozatszám:"
+msgid "Announced serial number"
+msgstr "Közölt sorozatszám"
msgid "Browse directory"
msgstr "Könyvtár tallózása"
@@ -32,32 +32,32 @@ msgstr "Könyvtár tallózása"
msgid "Collecting data..."
msgstr "Adatok gyűjtése..."
-msgid "Database directory:"
-msgstr "Adatbázis könyvtár:"
+msgid "Database directory"
+msgstr "Adatbázis könyvtár"
-msgid "Enable TIVO:"
-msgstr "TIVO engedélyezése:"
+msgid "Enable"
+msgstr "Engedélyezés"
-msgid "Enable inotify:"
-msgstr "Inotify engedélyezése:"
+msgid "Enable TIVO"
+msgstr "TIVO engedélyezése"
-msgid "Enable:"
-msgstr "Engedélyezés:"
+msgid "Enable inotify"
+msgstr "Inotify engedélyezése"
-msgid "Friendly name:"
-msgstr "Egyéni név:"
+msgid "Friendly name"
+msgstr "Egyéni név"
msgid "General Settings"
msgstr "Ãltalános beállítások"
-msgid "Interfaces:"
-msgstr "Interfészek:"
+msgid "Interfaces"
+msgstr "Interfészek"
-msgid "Log directory:"
-msgstr "Napló könyvtár:"
+msgid "Log directory"
+msgstr "Napló könyvtár"
-msgid "Media directories:"
-msgstr "Média könyvtárak:"
+msgid "Media directories"
+msgstr "Média könyvtárak"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -78,26 +78,26 @@ msgstr "Zene"
msgid "Network interfaces to serve."
msgstr "Kiszolgált hálózati interfészek."
+msgid "Notify interval"
+msgstr "Értesítési intervallum"
+
msgid "Notify interval in seconds."
msgstr "Értesítés intervalluma másodpercben."
-msgid "Notify interval:"
-msgstr "Értesítési intervallum:"
-
msgid "Pictures"
msgstr "Képek"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "HTTP forgalom (leírások, SOAP, média átvitel) portja."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "Szolgáltatott URL:"
+msgid "Presentation URL"
+msgstr "Szolgáltatott URL"
-msgid "Root container:"
-msgstr "Gyökér konténer:"
+msgid "Root container"
+msgstr "Gyökér konténer"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -167,8 +167,8 @@ msgstr "A MiniSSDPd socket elérési útját határozza meg."
msgid "Standard container"
msgstr "Szabvány konténer"
-msgid "Strict to DLNA standard:"
-msgstr "DLNA követelmények szigorú betartása:"
+msgid "Strict to DLNA standard"
+msgstr "DLNA követelmények szigorú betartása"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -191,8 +191,8 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "miniDLNA állapot"
-msgid "miniSSDP socket:"
-msgstr "miniSSDP socket:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP socket"
#~ msgid "Network interfaces to serve, comma delimited list."
#~ msgstr "Kiszolgált hálózati interfészek vesszővel elválasztott listája."
diff --git a/applications/luci-app-minidlna/po/it/minidlna.po b/applications/luci-app-minidlna/po/it/minidlna.po
index 4ecc3d4ae5..58eae32f70 100644
--- a/applications/luci-app-minidlna/po/it/minidlna.po
+++ b/applications/luci-app-minidlna/po/it/minidlna.po
@@ -14,17 +14,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Opzioni avanzate"
-msgid "Album art names:"
-msgstr "Nome Copertina Album:"
+msgid "Album art names"
+msgstr "Nome Copertina Album"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Numero modello annunciato:"
+msgid "Announced model number"
+msgstr "Numero modello annunciato"
-msgid "Announced serial number:"
-msgstr "Numero seriale annunciato:"
+msgid "Announced serial number"
+msgstr "Numero seriale annunciato"
msgid "Browse directory"
msgstr "Esplora directory"
@@ -32,32 +32,32 @@ msgstr "Esplora directory"
msgid "Collecting data..."
msgstr "Recuperando i dati..."
-msgid "Database directory:"
-msgstr "Directory database:"
+msgid "Database directory"
+msgstr "Directory database"
-msgid "Enable TIVO:"
-msgstr "Abilita TIVO:"
+msgid "Enable"
+msgstr "Abilita"
-msgid "Enable inotify:"
-msgstr "Abilita inotify:"
+msgid "Enable TIVO"
+msgstr "Abilita TIVO"
-msgid "Enable:"
-msgstr "Abilita:"
+msgid "Enable inotify"
+msgstr "Abilita inotify"
-msgid "Friendly name:"
-msgstr "Nome Comune:"
+msgid "Friendly name"
+msgstr "Nome Comune"
msgid "General Settings"
msgstr "Impostazioni generali"
-msgid "Interfaces:"
-msgstr "Interfacce:"
+msgid "Interfaces"
+msgstr "Interfacce"
-msgid "Log directory:"
-msgstr "Directory di log:"
+msgid "Log directory"
+msgstr "Directory di log"
-msgid "Media directories:"
-msgstr "Cartelle Supporto:"
+msgid "Media directories"
+msgstr "Cartelle Supporto"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -79,26 +79,26 @@ msgstr "Musica"
msgid "Network interfaces to serve."
msgstr "Interfaccia di rete usata."
+msgid "Notify interval"
+msgstr "Intervallo di notifica"
+
msgid "Notify interval in seconds."
msgstr "Intervallo di notifica in secondi."
-msgid "Notify interval:"
-msgstr "Intervallo di notifica:"
-
msgid "Pictures"
msgstr "Immagini"
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
-msgstr "Porta per traffico (descrizione, SOAP, trasferimento supporto) HTTP:"
+msgid "Port"
+msgstr "Porta"
-msgid "Port:"
-msgstr "Porta:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "Porta per traffico (descrizione, SOAP, trasferimento supporto) HTTP"
-msgid "Presentation URL:"
-msgstr "URL di Presentazione:"
+msgid "Presentation URL"
+msgstr "URL di Presentazione"
-msgid "Root container:"
-msgstr "Contenitore Principale:"
+msgid "Root container"
+msgstr "Contenitore Principale"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -169,8 +169,8 @@ msgstr "Specificare il percorso del socket MiniSSDPd."
msgid "Standard container"
msgstr "Contenitore Standard"
-msgid "Strict to DLNA standard:"
-msgstr "Scrupolosamente DLNA standard:"
+msgid "Strict to DLNA standard"
+msgstr "Scrupolosamente DLNA standard"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -195,5 +195,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "Stato miniDLNA"
-msgid "miniSSDP socket:"
-msgstr "Socket miniSSDP:"
+msgid "miniSSDP socket"
+msgstr "Socket miniSSDP"
diff --git a/applications/luci-app-minidlna/po/ja/minidlna.po b/applications/luci-app-minidlna/po/ja/minidlna.po
index de2eb9b57e..50dcfa5348 100644
--- a/applications/luci-app-minidlna/po/ja/minidlna.po
+++ b/applications/luci-app-minidlna/po/ja/minidlna.po
@@ -15,17 +15,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "詳細設定"
-msgid "Album art names:"
-msgstr "アルãƒãƒ ã‚¢ãƒ¼ãƒˆãƒ¯ãƒ¼ã‚¯ ファイルå:"
+msgid "Album art names"
+msgstr "アルãƒãƒ ã‚¢ãƒ¼ãƒˆãƒ¯ãƒ¼ã‚¯ ファイルå"
-msgid "Allow wide links:"
-msgstr "ワイド リンクã®è¨±å¯:"
+msgid "Allow wide links"
+msgstr "ワイド リンクã®è¨±å¯"
-msgid "Announced model number:"
-msgstr "通知ã™ã‚‹ãƒ¢ãƒ‡ãƒ«ç•ªå·:"
+msgid "Announced model number"
+msgstr "通知ã™ã‚‹ãƒ¢ãƒ‡ãƒ«ç•ªå·"
-msgid "Announced serial number:"
-msgstr "通知ã™ã‚‹ã‚·ãƒªã‚¢ãƒ«ãƒŠãƒ³ãƒãƒ¼:"
+msgid "Announced serial number"
+msgstr "通知ã™ã‚‹ã‚·ãƒªã‚¢ãƒ«ãƒŠãƒ³ãƒãƒ¼"
msgid "Browse directory"
msgstr "Browse directory"
@@ -33,32 +33,32 @@ msgstr "Browse directory"
msgid "Collecting data..."
msgstr "データåŽé›†ä¸­ã§ã™..."
-msgid "Database directory:"
-msgstr "データベース・ディレクトリ:"
+msgid "Database directory"
+msgstr "データベース・ディレクトリ"
-msgid "Enable TIVO:"
-msgstr "TIVO を有効ã«ã™ã‚‹:"
+msgid "Enable"
+msgstr "サービスを有効ã«ã™ã‚‹"
-msgid "Enable inotify:"
-msgstr "inotify を有効ã«ã™ã‚‹:"
+msgid "Enable TIVO"
+msgstr "TIVO を有効ã«ã™ã‚‹"
-msgid "Enable:"
-msgstr "サービスを有効ã«ã™ã‚‹:"
+msgid "Enable inotify"
+msgstr "inotify を有効ã«ã™ã‚‹"
-msgid "Friendly name:"
-msgstr "Friendlyå:"
+msgid "Friendly name"
+msgstr "Friendlyå"
msgid "General Settings"
msgstr "基本設定"
-msgid "Interfaces:"
-msgstr "インターフェース:"
+msgid "Interfaces"
+msgstr "インターフェース"
-msgid "Log directory:"
-msgstr "ログディレクトリ:"
+msgid "Log directory"
+msgstr "ログディレクトリ"
-msgid "Media directories:"
-msgstr "メディアディレクトリ:"
+msgid "Media directories"
+msgstr "メディアディレクトリ"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -78,26 +78,26 @@ msgstr "ミュージック"
msgid "Network interfaces to serve."
msgstr "サービスãŒä½¿ç”¨ã™ã‚‹ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ»ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’設定ã—ã¾ã™ã€‚"
+msgid "Notify interval"
+msgstr "通知間隔"
+
msgid "Notify interval in seconds."
msgstr "通知間隔を秒å˜ä½ã§è¨­å®šã—ã¾ã™ã€‚"
-msgid "Notify interval:"
-msgstr "通知間隔:"
-
msgid "Pictures"
msgstr "ピクãƒãƒ£"
+msgid "Port"
+msgstr "ãƒãƒ¼ãƒˆ"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "ステータス表示ã®ãŸã‚ã®HTTPãƒãƒ¼ãƒˆç•ªå·ã‚’設定ã—ã¦ãã ã•ã„。"
-msgid "Port:"
-msgstr "ãƒãƒ¼ãƒˆ:"
-
-msgid "Presentation URL:"
-msgstr "プレゼンテーションURL:"
+msgid "Presentation URL"
+msgstr "プレゼンテーションURL"
-msgid "Root container:"
-msgstr "ルート・コンテナ:"
+msgid "Root container"
+msgstr "ルート・コンテナ"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -167,8 +167,8 @@ msgstr "MiniSSDPd ソケットã®ãƒ‘スを設定ã—ã¦ãã ã•ã„。"
msgid "Standard container"
msgstr "標準コンテナ"
-msgid "Strict to DLNA standard:"
-msgstr "DLNAè¦æ ¼ã®åŽ³å®ˆ:"
+msgid "Strict to DLNA standard"
+msgstr "DLNAè¦æ ¼ã®åŽ³å®ˆ"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -192,8 +192,8 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "miniDLNA ステータス"
-msgid "miniSSDP socket:"
-msgstr "miniSSDP ソケット:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP ソケット"
#~ msgid "Network interfaces to serve, comma delimited list."
#~ msgstr ""
diff --git a/applications/luci-app-minidlna/po/ms/minidlna.po b/applications/luci-app-minidlna/po/ms/minidlna.po
index 7372c90a83..7ab7be4a7c 100644
--- a/applications/luci-app-minidlna/po/ms/minidlna.po
+++ b/applications/luci-app-minidlna/po/ms/minidlna.po
@@ -10,16 +10,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -28,31 +28,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -71,25 +71,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -143,7 +143,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -166,5 +166,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/no/minidlna.po b/applications/luci-app-minidlna/po/no/minidlna.po
index daf1996564..efabe28d4a 100644
--- a/applications/luci-app-minidlna/po/no/minidlna.po
+++ b/applications/luci-app-minidlna/po/no/minidlna.po
@@ -14,17 +14,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Avanserte Innstillinger"
-msgid "Album art names:"
-msgstr "Albumbilder navn:"
+msgid "Album art names"
+msgstr "Albumbilder navn"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Annonsert modellnummer:"
+msgid "Announced model number"
+msgstr "Annonsert modellnummer"
-msgid "Announced serial number:"
-msgstr "Annonsert serienummer:"
+msgid "Announced serial number"
+msgstr "Annonsert serienummer"
msgid "Browse directory"
msgstr "Bla katalog"
@@ -32,32 +32,32 @@ msgstr "Bla katalog"
msgid "Collecting data..."
msgstr "Samler inn data..."
-msgid "Database directory:"
-msgstr "Database katalog:"
+msgid "Database directory"
+msgstr "Database katalog"
-msgid "Enable TIVO:"
-msgstr "Aktiver TIVO:"
+msgid "Enable"
+msgstr "Aktiver"
-msgid "Enable inotify:"
-msgstr "Aktiver inotify:"
+msgid "Enable TIVO"
+msgstr "Aktiver TIVO"
-msgid "Enable:"
-msgstr "Aktiver:"
+msgid "Enable inotify"
+msgstr "Aktiver inotify"
-msgid "Friendly name:"
-msgstr "Vennlig navn:"
+msgid "Friendly name"
+msgstr "Vennlig navn"
msgid "General Settings"
msgstr "Generelle Innstillinger"
-msgid "Interfaces:"
-msgstr "Grensesnitt:"
+msgid "Interfaces"
+msgstr "Grensesnitt"
-msgid "Log directory:"
-msgstr "Logg katalog:"
+msgid "Log directory"
+msgstr "Logg katalog"
-msgid "Media directories:"
-msgstr "Media kataloger:"
+msgid "Media directories"
+msgstr "Media kataloger"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -79,26 +79,26 @@ msgstr "Musikk"
msgid "Network interfaces to serve."
msgstr "Nettverksgrensesnittene å tjene."
+msgid "Notify interval"
+msgstr "Notify intervall"
+
msgid "Notify interval in seconds."
msgstr "Notify intervall i sekunder."
-msgid "Notify interval:"
-msgstr "Notify intervall:"
-
msgid "Pictures"
msgstr "Bilder"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port for HTTP (beskrivelser, SOAP, media overføring) trafikk."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "Presentasjon URL:"
+msgid "Presentation URL"
+msgstr "Presentasjon URL"
-msgid "Root container:"
-msgstr "Root katalog:"
+msgid "Root container"
+msgstr "Root katalog"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -167,8 +167,8 @@ msgstr "Angi banen til MiniSSDPd socketen."
msgid "Standard container"
msgstr "Standard container"
-msgid "Strict to DLNA standard:"
-msgstr "Streng overholdelse av DLNA-standarden:"
+msgid "Strict to DLNA standard"
+msgstr "Streng overholdelse av DLNA-standarden"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -192,5 +192,5 @@ msgstr "MiniDLNA"
msgid "miniDLNA Status"
msgstr "MiniDLNA Status"
-msgid "miniSSDP socket:"
-msgstr "miniSSDP socket:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP socket"
diff --git a/applications/luci-app-minidlna/po/pl/minidlna.po b/applications/luci-app-minidlna/po/pl/minidlna.po
index 8c03b51556..122e9562b8 100644
--- a/applications/luci-app-minidlna/po/pl/minidlna.po
+++ b/applications/luci-app-minidlna/po/pl/minidlna.po
@@ -15,17 +15,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
-msgid "Album art names:"
-msgstr "Nazwy okładek albumów:"
+msgid "Album art names"
+msgstr "Nazwy okładek albumów"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Rozgłaszany model:"
+msgid "Announced model number"
+msgstr "Rozgłaszany model"
-msgid "Announced serial number:"
-msgstr "Rozgłaszany numer seryjny:"
+msgid "Announced serial number"
+msgstr "Rozgłaszany numer seryjny"
msgid "Browse directory"
msgstr "PrzeglÄ…daj folder"
@@ -33,32 +33,32 @@ msgstr "PrzeglÄ…daj folder"
msgid "Collecting data..."
msgstr "Zbieranie informacji..."
-msgid "Database directory:"
-msgstr "Katalog bazy danych:"
+msgid "Database directory"
+msgstr "Katalog bazy danych"
-msgid "Enable TIVO:"
-msgstr "WÅ‚Ä…cz TIVO:"
+msgid "Enable"
+msgstr "WÅ‚Ä…cz"
-msgid "Enable inotify:"
-msgstr "WÅ‚Ä…cz inotify:"
+msgid "Enable TIVO"
+msgstr "WÅ‚Ä…cz TIVO"
-msgid "Enable:"
-msgstr "WÅ‚Ä…cz:"
+msgid "Enable inotify"
+msgstr "WÅ‚Ä…cz inotify"
-msgid "Friendly name:"
-msgstr "Przyjazna nazwa:"
+msgid "Friendly name"
+msgstr "Przyjazna nazwa"
msgid "General Settings"
msgstr "Ustawienia ogólne"
-msgid "Interfaces:"
-msgstr "Interfejsy:"
+msgid "Interfaces"
+msgstr "Interfejsy"
-msgid "Log directory:"
-msgstr "Katalog dzienników (logów):"
+msgid "Log directory"
+msgstr "Katalog dzienników (logów)"
-msgid "Media directories:"
-msgstr "Katalog mediów:"
+msgid "Media directories"
+msgstr "Katalog mediów"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -78,26 +78,26 @@ msgstr "Muzyka"
msgid "Network interfaces to serve."
msgstr "Interfejsy sieciowe do obsługiwania."
+msgid "Notify interval"
+msgstr "Interwał powiadamiania."
+
msgid "Notify interval in seconds."
msgstr "Interwał powiadamiania w sekundach."
-msgid "Notify interval:"
-msgstr "Interwał powiadamiania."
-
msgid "Pictures"
msgstr "Obrazy"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port dla ruchu HTTP (opisy, SOAP, transfer mediów)."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "URL prezentacyjny:"
+msgid "Presentation URL"
+msgstr "URL prezentacyjny"
-msgid "Root container:"
-msgstr "Kontener główny (root):"
+msgid "Root container"
+msgstr "Kontener główny (root)"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -166,8 +166,8 @@ msgstr "Podaj ścieżkę do gniazda (socketu) miniSSDPd."
msgid "Standard container"
msgstr "Standardowy kontener"
-msgid "Strict to DLNA standard:"
-msgstr "Ściśle trzymaj się standardów DLNA:"
+msgid "Strict to DLNA standard"
+msgstr "Ściśle trzymaj się standardów DLNA"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -192,5 +192,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "Status miniDLNA"
-msgid "miniSSDP socket:"
-msgstr "Gniazdo (socket) miniSSDP:"
+msgid "miniSSDP socket"
+msgstr "Gniazdo (socket) miniSSDP"
diff --git a/applications/luci-app-minidlna/po/pt-br/minidlna.po b/applications/luci-app-minidlna/po/pt-br/minidlna.po
index 5ae9226d18..f5eb735789 100644
--- a/applications/luci-app-minidlna/po/pt-br/minidlna.po
+++ b/applications/luci-app-minidlna/po/pt-br/minidlna.po
@@ -11,17 +11,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Configuração Avançada"
-msgid "Album art names:"
+msgid "Album art names"
msgstr "Nomes do Ãlbum artistico: "
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "numero de modelo anunciado:"
+msgid "Announced model number"
+msgstr "numero de modelo anunciado"
-msgid "Announced serial number:"
-msgstr "Anunciar serial:"
+msgid "Announced serial number"
+msgstr "Anunciar serial"
msgid "Browse directory"
msgstr "Procurar diretório "
@@ -29,32 +29,32 @@ msgstr "Procurar diretório "
msgid "Collecting data..."
msgstr "Coletando dados..."
-msgid "Database directory:"
-msgstr "Banco de dados de diretório:"
+msgid "Database directory"
+msgstr "Banco de dados de diretório"
-msgid "Enable TIVO:"
-msgstr "Ativar TIVO:"
+msgid "Enable"
+msgstr "Ativado"
-msgid "Enable inotify:"
-msgstr "Ativar inotify:"
+msgid "Enable TIVO"
+msgstr "Ativar TIVO"
-msgid "Enable:"
-msgstr "Ativado"
+msgid "Enable inotify"
+msgstr "Ativar inotify"
-msgid "Friendly name:"
-msgstr "Nome amigável:"
+msgid "Friendly name"
+msgstr "Nome amigável"
msgid "General Settings"
msgstr "Configuração Geral"
-msgid "Interfaces:"
-msgstr "Interfaces:"
+msgid "Interfaces"
+msgstr "Interfaces"
-msgid "Log directory:"
+msgid "Log directory"
msgstr "Diretório de Log"
-msgid "Media directories:"
-msgstr "Diretórios de mídia:"
+msgid "Media directories"
+msgstr "Diretórios de mídia"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -76,26 +76,26 @@ msgstr "Musica"
msgid "Network interfaces to serve."
msgstr "As interfaces de rede para servir."
+msgid "Notify interval"
+msgstr "Intervalo de Notificação"
+
msgid "Notify interval in seconds."
msgstr "Notificação de intervalo em segundos."
-msgid "Notify interval:"
-msgstr "Intervalo de Notificação:"
-
msgid "Pictures"
msgstr "Imagems"
+msgid "Port"
+msgstr "Porta"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Porta para HTTP (descrições, SOAP, transferência de mídia) de tráfego."
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "Presentation URL:"
-msgstr "URL para Apresentação:"
+msgid "Presentation URL"
+msgstr "URL para Apresentação"
-msgid "Root container:"
-msgstr "Root container:"
+msgid "Root container"
+msgstr "Root container"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
@@ -169,8 +169,8 @@ msgstr "Especifique o caminho para o soquete MiniSSDPd."
msgid "Standard container"
msgstr "container padrão"
-msgid "Strict to DLNA standard:"
-msgstr "Strict para DLNA padrão:"
+msgid "Strict to DLNA standard"
+msgstr "Strict para DLNA padrão"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
@@ -196,5 +196,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "miniDLNA Status"
-msgid "miniSSDP socket:"
-msgstr "miniSSDP soquete:"
+msgid "miniSSDP socket"
+msgstr "miniSSDP soquete"
diff --git a/applications/luci-app-minidlna/po/pt/minidlna.po b/applications/luci-app-minidlna/po/pt/minidlna.po
index dbd835f509..f1b8ee4440 100644
--- a/applications/luci-app-minidlna/po/pt/minidlna.po
+++ b/applications/luci-app-minidlna/po/pt/minidlna.po
@@ -14,17 +14,17 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Definições Avançadas"
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
-msgstr "Número modelo anunciado:"
+msgid "Announced model number"
+msgstr "Número modelo anunciado"
-msgid "Announced serial number:"
-msgstr "Número de série anunciado:"
+msgid "Announced serial number"
+msgstr "Número de série anunciado"
msgid "Browse directory"
msgstr "Procurar directório"
@@ -32,32 +32,32 @@ msgstr "Procurar directório"
msgid "Collecting data..."
msgstr "A obter dados..."
-msgid "Database directory:"
-msgstr "Directório da base de dados:"
+msgid "Database directory"
+msgstr "Directório da base de dados"
-msgid "Enable TIVO:"
-msgstr "Ativar TIVO:"
+msgid "Enable"
+msgstr "Ativar"
-msgid "Enable inotify:"
-msgstr "Ativar inotify:"
+msgid "Enable TIVO"
+msgstr "Ativar TIVO"
-msgid "Enable:"
-msgstr "Ativar:"
+msgid "Enable inotify"
+msgstr "Ativar inotify"
-msgid "Friendly name:"
-msgstr "Nome amigável:"
+msgid "Friendly name"
+msgstr "Nome amigável"
msgid "General Settings"
msgstr "Definições Gerais"
-msgid "Interfaces:"
-msgstr "Interfaces:"
+msgid "Interfaces"
+msgstr "Interfaces"
-msgid "Log directory:"
-msgstr "Directório de Log:"
+msgid "Log directory"
+msgstr "Directório de Log"
-msgid "Media directories:"
-msgstr "Pastas multimédia:"
+msgid "Media directories"
+msgstr "Pastas multimédia"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
@@ -79,25 +79,25 @@ msgstr "Música"
msgid "Network interfaces to serve."
msgstr "Interfaces de rede a serem seervidas."
+msgid "Notify interval"
+msgstr "Intervalo de Notificação"
+
msgid "Notify interval in seconds."
msgstr "Intervalo de notificação em segundos."
-msgid "Notify interval:"
-msgstr "Intervalo de Notificação:"
-
msgid "Pictures"
msgstr "Imagens"
+msgid "Port"
+msgstr "Porta"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Porta para tráfego HTTP (descrições, SOAP, tranferencia de conteudos)."
-msgid "Port:"
-msgstr "Porta:"
-
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -151,7 +151,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -174,5 +174,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/ro/minidlna.po b/applications/luci-app-minidlna/po/ro/minidlna.po
index 5e79cd2cf7..c129b06aa9 100644
--- a/applications/luci-app-minidlna/po/ro/minidlna.po
+++ b/applications/luci-app-minidlna/po/ro/minidlna.po
@@ -15,16 +15,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Setări avansate"
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -33,31 +33,31 @@ msgstr "Răsfoire director"
msgid "Collecting data..."
msgstr "Colectare date..."
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
-msgstr "Activare TIVO:"
+msgid "Enable"
+msgstr "Activare"
-msgid "Enable inotify:"
-msgstr "Activare inotify:"
+msgid "Enable TIVO"
+msgstr "Activare TIVO"
-msgid "Enable:"
-msgstr "Activare:"
+msgid "Enable inotify"
+msgstr "Activare inotify"
-msgid "Friendly name:"
-msgstr "Nume prieten:"
+msgid "Friendly name"
+msgstr "Nume prieten"
msgid "General Settings"
msgstr "Setări generale"
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr "Interfeţe"
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr "Directoare media"
msgid ""
@@ -76,25 +76,25 @@ msgstr "Muzică"
msgid "Network interfaces to serve."
msgstr ""
+msgid "Notify interval"
+msgstr "Notificare interval"
+
msgid "Notify interval in seconds."
msgstr "Notificare interval în secunde."
-msgid "Notify interval:"
-msgstr "Notificare interval:"
-
msgid "Pictures"
msgstr "Fotografii"
+msgid "Port"
+msgstr "Port"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Port pentru HTTP (descrieri, SOAP, transfer media) trafic."
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Presentation URL:"
-msgstr "URL de prezentare:"
+msgid "Presentation URL"
+msgstr "URL de prezentare"
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -148,7 +148,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -171,5 +171,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "Stare miniDLNA"
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/ru/minidlna.po b/applications/luci-app-minidlna/po/ru/minidlna.po
index 859cf1dca7..04a2305588 100644
--- a/applications/luci-app-minidlna/po/ru/minidlna.po
+++ b/applications/luci-app-minidlna/po/ru/minidlna.po
@@ -18,16 +18,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr "Дополнительные наÑтройки"
-msgid "Album art names:"
+msgid "Album art names"
msgstr "Имена обложек альбома"
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr "Разрешить ÑÑылки"
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr "ОбъÑвить номер модели"
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr "ОбъÑвить Ñерийный номер"
msgid "Browse directory"
@@ -36,31 +36,31 @@ msgstr "Обзор папок"
msgid "Collecting data..."
msgstr "Сбор данных..."
-msgid "Database directory:"
+msgid "Database directory"
msgstr "Папка базы данных"
-msgid "Enable TIVO:"
+msgid "Enable"
+msgstr "Включить"
+
+msgid "Enable TIVO"
msgstr "Включить TiVo"
-msgid "Enable inotify:"
+msgid "Enable inotify"
msgstr "Включить inotify"
-msgid "Enable:"
-msgstr "Включить"
-
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð°"
msgid "General Settings"
msgstr "ОÑновные наÑтройки"
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr "ИнтерфейÑÑ‹"
-msgid "Log directory:"
+msgid "Log directory"
msgstr "Папка ÑиÑтемного<br />журнала"
-msgid "Media directories:"
+msgid "Media directories"
msgstr "Папки медиа"
msgid ""
@@ -81,25 +81,25 @@ msgstr "Музыка"
msgid "Network interfaces to serve."
msgstr "ИÑпользовать Ñетевые интерфейÑÑ‹."
+msgid "Notify interval"
+msgstr "Интервал уведомлениÑ"
+
msgid "Notify interval in seconds."
msgstr "Интервал ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð² Ñекундах."
-msgid "Notify interval:"
-msgstr "Интервал уведомлениÑ"
-
msgid "Pictures"
msgstr "Картинки"
+msgid "Port"
+msgstr "Порт"
+
msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr "Задайте порт Ð´Ð»Ñ HTTP-трафика (опиÑаниÑ, SOAP, передача мультимедиа)."
-msgid "Port:"
-msgstr "Порт"
-
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr "Задать URL-адреÑ"
-msgid "Root container:"
+msgid "Root container"
msgstr "Root контейнер"
msgid ""
@@ -168,7 +168,7 @@ msgstr "Укажите путь к Ñокету MiniSSDPd."
msgid "Standard container"
msgstr "Стандартный контейнер"
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr "Следовать Ñтандарту DLNA"
msgid ""
@@ -193,5 +193,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "СоÑтоÑние miniDLNA"
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr "miniSSDP Ñокет"
diff --git a/applications/luci-app-minidlna/po/sk/minidlna.po b/applications/luci-app-minidlna/po/sk/minidlna.po
index 2968311d2a..df3b619889 100644
--- a/applications/luci-app-minidlna/po/sk/minidlna.po
+++ b/applications/luci-app-minidlna/po/sk/minidlna.po
@@ -11,16 +11,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -29,31 +29,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -72,25 +72,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -144,7 +144,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -167,5 +167,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/sv/minidlna.po b/applications/luci-app-minidlna/po/sv/minidlna.po
index d06abfd4cd..d69cacd503 100644
--- a/applications/luci-app-minidlna/po/sv/minidlna.po
+++ b/applications/luci-app-minidlna/po/sv/minidlna.po
@@ -12,16 +12,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -30,31 +30,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -73,25 +73,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -145,7 +145,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -168,5 +168,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/templates/minidlna.pot b/applications/luci-app-minidlna/po/templates/minidlna.pot
index 0f22c674dd..985def9c94 100644
--- a/applications/luci-app-minidlna/po/templates/minidlna.pot
+++ b/applications/luci-app-minidlna/po/templates/minidlna.pot
@@ -4,16 +4,16 @@ msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -22,31 +22,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -65,25 +65,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -137,7 +137,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -160,5 +160,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/tr/minidlna.po b/applications/luci-app-minidlna/po/tr/minidlna.po
index 1eeba3f1bc..1f4559f86b 100644
--- a/applications/luci-app-minidlna/po/tr/minidlna.po
+++ b/applications/luci-app-minidlna/po/tr/minidlna.po
@@ -11,16 +11,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -29,31 +29,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -72,25 +72,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -144,7 +144,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -167,5 +167,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/uk/minidlna.po b/applications/luci-app-minidlna/po/uk/minidlna.po
index db23241cc5..21312658e7 100644
--- a/applications/luci-app-minidlna/po/uk/minidlna.po
+++ b/applications/luci-app-minidlna/po/uk/minidlna.po
@@ -12,16 +12,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -30,31 +30,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -73,25 +73,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -145,7 +145,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -168,5 +168,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/vi/minidlna.po b/applications/luci-app-minidlna/po/vi/minidlna.po
index 1eeba3f1bc..1f4559f86b 100644
--- a/applications/luci-app-minidlna/po/vi/minidlna.po
+++ b/applications/luci-app-minidlna/po/vi/minidlna.po
@@ -11,16 +11,16 @@ msgstr ""
msgid "Advanced Settings"
msgstr ""
-msgid "Album art names:"
+msgid "Album art names"
msgstr ""
-msgid "Allow wide links:"
+msgid "Allow wide links"
msgstr ""
-msgid "Announced model number:"
+msgid "Announced model number"
msgstr ""
-msgid "Announced serial number:"
+msgid "Announced serial number"
msgstr ""
msgid "Browse directory"
@@ -29,31 +29,31 @@ msgstr ""
msgid "Collecting data..."
msgstr ""
-msgid "Database directory:"
+msgid "Database directory"
msgstr ""
-msgid "Enable TIVO:"
+msgid "Enable"
msgstr ""
-msgid "Enable inotify:"
+msgid "Enable TIVO"
msgstr ""
-msgid "Enable:"
+msgid "Enable inotify"
msgstr ""
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr ""
msgid "General Settings"
msgstr ""
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr ""
-msgid "Log directory:"
+msgid "Log directory"
msgstr ""
-msgid "Media directories:"
+msgid "Media directories"
msgstr ""
msgid ""
@@ -72,25 +72,25 @@ msgstr ""
msgid "Network interfaces to serve."
msgstr ""
-msgid "Notify interval in seconds."
+msgid "Notify interval"
msgstr ""
-msgid "Notify interval:"
+msgid "Notify interval in seconds."
msgstr ""
msgid "Pictures"
msgstr ""
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgid "Port"
msgstr ""
-msgid "Port:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
msgstr ""
-msgid "Presentation URL:"
+msgid "Presentation URL"
msgstr ""
-msgid "Root container:"
+msgid "Root container"
msgstr ""
msgid ""
@@ -144,7 +144,7 @@ msgstr ""
msgid "Standard container"
msgstr ""
-msgid "Strict to DLNA standard:"
+msgid "Strict to DLNA standard"
msgstr ""
msgid ""
@@ -167,5 +167,5 @@ msgstr ""
msgid "miniDLNA Status"
msgstr ""
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr ""
diff --git a/applications/luci-app-minidlna/po/zh-cn/minidlna.po b/applications/luci-app-minidlna/po/zh-cn/minidlna.po
index 76ebcdade2..49eeeb22d9 100644
--- a/applications/luci-app-minidlna/po/zh-cn/minidlna.po
+++ b/applications/luci-app-minidlna/po/zh-cn/minidlna.po
@@ -1,73 +1,76 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-07-07 16:21+0200\n"
-"Last-Translator: qiuchengxuan <qiuchengxuan@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 19:31+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Advanced Settings"
msgstr "高级设置"
-msgid "Album art names:"
-msgstr "专辑å°é¢å称:"
+msgid "Album art names"
+msgstr "专辑艺术å:"
-msgid "Allow wide links:"
-msgstr ""
+msgid "Allow wide links"
+msgstr "å…许全局链接:"
-msgid "Announced model number:"
-msgstr "通告型å·ï¼š"
+msgid "Announced model number"
+msgstr "通告的型å·ï¼š"
-msgid "Announced serial number:"
-msgstr "通告编å·ï¼š"
+msgid "Announced serial number"
+msgstr "通告的编å·ï¼š"
msgid "Browse directory"
msgstr "æµè§ˆç›®å½•"
msgid "Collecting data..."
-msgstr "收集数æ®..."
+msgstr "正在收集数æ®â€¦"
-msgid "Database directory:"
+msgid "Database directory"
msgstr "æ•°æ®åº“目录:"
-msgid "Enable TIVO:"
-msgstr "å¯ç”¨TIVO:"
+msgid "Enable"
+msgstr "å¯ç”¨ï¼š"
-msgid "Enable inotify:"
-msgstr "å¯ç”¨inotify:"
+msgid "Enable TIVO"
+msgstr "å¯ç”¨ TIVO:"
-msgid "Enable:"
-msgstr "å¯ç”¨ï¼š"
+msgid "Enable inotify"
+msgstr "å¯ç”¨ inotify:"
-msgid "Friendly name:"
+msgid "Friendly name"
msgstr "å‹å¥½å称:"
msgid "General Settings"
msgstr "基本设置"
-msgid "Interfaces:"
+msgid "Interfaces"
msgstr "接å£ï¼š"
-msgid "Log directory:"
+msgid "Log directory"
msgstr "日志目录:"
-msgid "Media directories:"
+msgid "Media directories"
msgstr "媒体目录:"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
"UPnP-AV clients."
-msgstr "MiniDLNA是目标为完全兼容DLNA / UPnP-AV客户端的æœåŠ¡å™¨è½¯ä»¶ã€‚"
+msgstr "MiniDLNA 是æœåŠ¡å™¨è½¯ä»¶ï¼Œç›®æ ‡ä¸ºå®Œå…¨å…¼å®¹ DLNA/UPnP-AV 客户端。"
msgid ""
"Model number the miniDLNA daemon will report to clients in its XML "
"description."
-msgstr "miniDLNA守护程åºå°†åœ¨å…¶XMLæ述中å‘客户端通告型å·ã€‚"
+msgstr "miniDLNA 守护程åºå°†åœ¨å…¶ XML æ述中å‘客户端通告的型å·ã€‚"
msgid "Music"
msgstr "音ä¹"
@@ -75,66 +78,66 @@ msgstr "音ä¹"
msgid "Network interfaces to serve."
msgstr "æœåŠ¡çš„网络接å£ã€‚"
-msgid "Notify interval in seconds."
-msgstr "通知的时间间隔,以秒为å•ä½ã€‚"
-
-msgid "Notify interval:"
+msgid "Notify interval"
msgstr "通知的时间间隔:"
+msgid "Notify interval in seconds."
+msgstr "通知的时间间隔(秒)。"
+
msgid "Pictures"
msgstr "图片"
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
-msgstr "Port for HTTP (descriptions, SOAP, media transfer) traffic."
-
-msgid "Port:"
+msgid "Port"
msgstr "端å£ï¼š"
-msgid "Presentation URL:"
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "HTTP(æ述,SOAP,媒体传输)æµé‡çš„端å£ã€‚"
+
+msgid "Presentation URL"
msgstr "æœåŠ¡ç½‘å€"
-msgid "Root container:"
+msgid "Root container"
msgstr "根目录:"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
"description."
-msgstr "miniDLNA守护程åºå°†åœ¨å…¶XMLæ述中å‘客户端通告编å·ã€‚"
+msgstr "miniDLNA 守护程åºå°†åœ¨å…¶ XML æ述中å‘客户端通告的编å·ã€‚"
msgid ""
"Set this if you want to customize the name that shows up on your clients."
-msgstr "设置自定义å称。"
+msgstr "设定自定义å称。"
msgid ""
"Set this if you would like to specify the directory where you want MiniDLNA "
"to store its database and album art cache."
-msgstr "设置miniDLNA缓存目录"
+msgstr "设定 miniDLNA æ•°æ®åº“和专辑å°é¢ç¼“存目录"
msgid ""
"Set this if you would like to specify the directory where you want MiniDLNA "
"to store its log file."
-msgstr "设置miniDLNA日志目录"
+msgstr "设定 MiniDLNA 日志目录"
msgid ""
"Set this to allow serving content outside the media root (via symlinks)."
-msgstr ""
+msgstr "å…许(通过符å·é“¾æŽ¥ï¼‰æ供媒体根目录之外的内容。"
msgid ""
"Set this to enable inotify monitoring to automatically discover new files."
-msgstr "设定å¯ç”¨inotify监控,自动å‘现新的文件。"
+msgstr "设定å¯ç”¨ inotify 监控,自动å‘现新的文件。"
msgid ""
"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
"supporting HMO."
-msgstr "为HMO TiVoå¯ç”¨JPGå’ŒMP3æµåª’体支æŒã€‚"
+msgstr "ä¸ºæ”¯æŒ TiVo çš„ HMO å¯ç”¨ JPG å’Œ MP3 æµåª’体支æŒã€‚"
msgid ""
"Set this to strictly adhere to DLNA standards. This will allow server-side "
"downscaling of very large JPEG images, which may hurt JPEG serving "
"performance on (at least) Sony DLNA products."
msgstr ""
-"设定严格éµå®ˆDLNA标准。这将å…许æœåŠ¡å™¨ç«¯é™å°å¤§å°ºå¯¸JPEG图åƒï¼Œåœ¨ï¼ˆè‡³å°‘)索尼DLNA"
-"的产å“è¿™å¯èƒ½ä¼šé™ä½ŽJPEGæœåŠ¡æ€§èƒ½ã€‚"
+"设定严格éµå®ˆ DLNA 标准。这将å…许æœåŠ¡å™¨ç«¯ç¼©å°éžå¸¸å¤§çš„ JPEG 图åƒï¼Œè¿™å¯èƒ½ä¼šæŸå®³"
+"(至少)索尼 DLNA 产å“上的 JPEG æœåŠ¡æ€§èƒ½ã€‚"
# 如果写æˆA,/mnt/media/Music,uci会报错。实际上应该是A,/mnt/media/Music,这样生æˆçš„minidlna.conf刚好是A,/mnt/media/Music
msgid ""
@@ -143,29 +146,29 @@ msgid ""
"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
"(eg. A,/mnt/media/Music). Multiple directories can be specified."
msgstr ""
-"设置è¦æ‰«æ的目录。如果您想é™åˆ¶ç‰¹å®šå†…容类型的目录,您å¯ä»¥åœ¨å‰é¢åŠ ä¸Šç±»åž‹ï¼ˆç”¨äºŽ"
-"音频'A','V'视频,'P'图片),其次是用逗å·åˆ†éš”的目录(如A,/mnt/媒体/音ä¹ï¼‰ã€‚å¯"
-"以指定多个目录。"
+"设定è¦æ‰«æ的目录。如果您想é™åˆ¶ç‰¹å®šå†…容类型的目录,您å¯ä»¥åœ¨å‰é¢åŠ ä¸Šç±»åž‹ï¼ˆâ€œAâ€æŒ‡"
+"音频,“Vâ€æŒ‡è§†é¢‘,“Pâ€æŒ‡å›¾ç‰‡ï¼‰ï¼Œå…¶æ¬¡æ˜¯ç”¨é€—å·åˆ†éš”的目录(如A,/mnt/media/"
+"Music)。å¯ä»¥æŒ‡å®šå¤šä¸ªç›®å½•ã€‚"
msgid "Specify the path to the MiniSSDPd socket."
-msgstr "指定MiniSSDPd socket的路径。"
+msgstr "指定 MiniSSDPd socket 的路径。"
msgid "Standard container"
msgstr "基本目录"
-msgid "Strict to DLNA standard:"
-msgstr "严格的DLNA标准:"
+msgid "Strict to DLNA standard"
+msgstr "严格 DLNA 标准:"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
"files."
-msgstr "miniDLNAæœåŠ¡å·²å¯ç”¨ï¼Œæä¾› %d 音频, %d 视频 å’Œ %d 图片."
+msgstr "miniDLNA æœåŠ¡æ­£åœ¨è¿è¡Œï¼Œæä¾› %d æ¡éŸ³é¢‘,%d 个视频和 %d 张图片。"
msgid "The miniDLNA service is not running."
-msgstr "miniDLNAæœåŠ¡æœªå¯ç”¨"
+msgstr "miniDLNA æœåŠ¡æœªè¿è¡Œã€‚"
msgid "This is a list of file names to check for when searching for album art."
-msgstr "这是一个文件å列表,为æœç´¢ä¸“辑å°é¢ã€‚"
+msgstr "这是一个文件å列表,用于æœç´¢ä¸“辑å°é¢ã€‚"
msgid "Video"
msgstr "视频"
@@ -176,5 +179,5 @@ msgstr "miniDLNA"
msgid "miniDLNA Status"
msgstr "miniDLNA 状æ€"
-msgid "miniSSDP socket:"
+msgid "miniSSDP socket"
msgstr "miniSSDP socket:"
diff --git a/applications/luci-app-minidlna/po/zh-tw/minidlna.po b/applications/luci-app-minidlna/po/zh-tw/minidlna.po
index 2c636757d2..76b8d48ab2 100644
--- a/applications/luci-app-minidlna/po/zh-tw/minidlna.po
+++ b/applications/luci-app-minidlna/po/zh-tw/minidlna.po
@@ -1,174 +1,184 @@
+#
+# omnistack <omnistack@gmail.com>, 2014.
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-14 13:15+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 19:32+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Advanced Settings"
-msgstr "進階設定值"
+msgstr "進階設定"
-msgid "Album art names:"
-msgstr "專輯å稱"
+msgid "Album art names"
+msgstr "專輯è—è¡“å:"
-msgid "Allow wide links:"
-msgstr ""
+msgid "Allow wide links"
+msgstr "å…許全域性連çµï¼š"
-msgid "Announced model number:"
-msgstr "已宣告型號數é‡"
+msgid "Announced model number"
+msgstr "通告的型號:"
-msgid "Announced serial number:"
-msgstr "已宣告åºè™Ÿæ•¸é‡"
+msgid "Announced serial number"
+msgstr "通告的編號:"
msgid "Browse directory"
msgstr "ç€è¦½ç›®éŒ„"
msgid "Collecting data..."
-msgstr "收集資料進行中..."
+msgstr "正在收集資料…"
-msgid "Database directory:"
-msgstr "資料庫目錄所在:"
+msgid "Database directory"
+msgstr "資料庫目錄:"
-msgid "Enable TIVO:"
-msgstr "啟用TIVO代錄"
+msgid "Enable"
+msgstr "啟用:"
-msgid "Enable inotify:"
-msgstr "啟用檔案事件監控"
+msgid "Enable TIVO"
+msgstr "啟用 TIVO:"
-msgid "Enable:"
-msgstr "啟用:"
+msgid "Enable inotify"
+msgstr "啟用 inotify:"
-msgid "Friendly name:"
-msgstr "å‹å–„å稱"
+msgid "Friendly name"
+msgstr "å‹å–„å稱:"
msgid "General Settings"
-msgstr "一般設定值"
+msgstr "基本設定"
-msgid "Interfaces:"
-msgstr "介é¢"
+msgid "Interfaces"
+msgstr "介é¢ï¼š"
-msgid "Log directory:"
-msgstr "Log紀錄放置å€"
+msgid "Log directory"
+msgstr "日誌目錄:"
-msgid "Media directories:"
-msgstr "媒體目錄å€:"
+msgid "Media directories"
+msgstr "媒體目錄:"
msgid ""
"MiniDLNA is server software with the aim of being fully compliant with DLNA/"
"UPnP-AV clients."
-msgstr "MiniDLNA是一個伺æœå™¨è»Ÿé«”é‡å°èƒ½å®Œå…¨å…¼å®¹DLNA/UPnP-AV用戶端."
+msgstr "MiniDLNA 是伺æœå™¨è»Ÿé«”,目標為完全相容 DLNA/UPnP-AV 客戶端。"
msgid ""
"Model number the miniDLNA daemon will report to clients in its XML "
"description."
-msgstr ""
+msgstr "miniDLNA 守護程å¼å°‡åœ¨å…¶ XML æ述中å‘客戶端通告的型號。"
msgid "Music"
-msgstr ""
+msgstr "音樂"
msgid "Network interfaces to serve."
-msgstr ""
+msgstr "æœå‹™çš„網路介é¢ã€‚"
-msgid "Notify interval in seconds."
-msgstr ""
+msgid "Notify interval"
+msgstr "通知的時間間隔:"
-msgid "Notify interval:"
-msgstr ""
+msgid "Notify interval in seconds."
+msgstr "通知的時間間隔(秒)。"
msgid "Pictures"
-msgstr ""
+msgstr "圖片"
-msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
-msgstr ""
+msgid "Port"
+msgstr "埠:"
-msgid "Port:"
-msgstr ""
+msgid "Port for HTTP (descriptions, SOAP, media transfer) traffic."
+msgstr "HTTP(æ述,SOAP,媒體傳輸)æµé‡çš„埠。"
-msgid "Presentation URL:"
-msgstr ""
+msgid "Presentation URL"
+msgstr "æœå‹™ç¶²å€"
-msgid "Root container:"
-msgstr ""
+msgid "Root container"
+msgstr "根目錄:"
msgid ""
"Serial number the miniDLNA daemon will report to clients in its XML "
"description."
-msgstr ""
+msgstr "miniDLNA 守護程å¼å°‡åœ¨å…¶ XML æ述中å‘客戶端通告的編號。"
msgid ""
"Set this if you want to customize the name that shows up on your clients."
-msgstr ""
+msgstr "設定自定義å稱。"
msgid ""
"Set this if you would like to specify the directory where you want MiniDLNA "
"to store its database and album art cache."
-msgstr ""
+msgstr "設定 miniDLNA 資料庫和專輯å°é¢å¿«å–目錄"
msgid ""
"Set this if you would like to specify the directory where you want MiniDLNA "
"to store its log file."
-msgstr ""
+msgstr "設定 MiniDLNA 日誌目錄"
msgid ""
"Set this to allow serving content outside the media root (via symlinks)."
-msgstr ""
+msgstr "å…許(通éŽç¬¦è™Ÿé€£çµï¼‰æ供媒體根目錄之外的內容。"
msgid ""
"Set this to enable inotify monitoring to automatically discover new files."
-msgstr ""
+msgstr "設定啟用 inotify 監控,自動發ç¾æ–°çš„檔案。"
msgid ""
"Set this to enable support for streaming .jpg and .mp3 files to a TiVo "
"supporting HMO."
-msgstr ""
+msgstr "ç‚ºæ”¯æ´ TiVo çš„ HMO 啟用 JPG å’Œ MP3 æµåª’體支æ´ã€‚"
msgid ""
"Set this to strictly adhere to DLNA standards. This will allow server-side "
"downscaling of very large JPEG images, which may hurt JPEG serving "
"performance on (at least) Sony DLNA products."
msgstr ""
+"設定嚴格éµå®ˆ DLNA 標準。這將å…許伺æœå™¨ç«¯ç¸®å°éžå¸¸å¤§çš„ JPEG 影象,這å¯èƒ½æœƒæ害"
+"(至少)索尼 DLNA 產å“上的 JPEG æœå‹™æ•ˆèƒ½ã€‚"
+# 如果寫æˆA,/mnt/media/Music,uci會報錯。實際上應該是A,/mnt/media/Music,這樣生æˆçš„minidlna.conf剛好是A,/mnt/media/Music
msgid ""
"Set this to the directory you want scanned. If you want to restrict the "
"directory to a specific content type, you can prepend the type ('A' for "
"audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
"(eg. A,/mnt/media/Music). Multiple directories can be specified."
msgstr ""
+"設定è¦æŽƒæ的目錄。如果您想é™åˆ¶ç‰¹å®šå…§å®¹åž‹åˆ¥çš„目錄,您å¯ä»¥åœ¨å‰é¢åŠ ä¸Šåž‹åˆ¥ï¼ˆâ€œAâ€æŒ‡"
+"音訊,“Vâ€æŒ‡è¦–訊,“Pâ€æŒ‡åœ–片),其次是用逗號分隔的目錄(如A,/mnt/media/"
+"Music)。å¯ä»¥æŒ‡å®šå¤šå€‹ç›®éŒ„。"
msgid "Specify the path to the MiniSSDPd socket."
-msgstr ""
+msgstr "指定 MiniSSDPd socket 的路徑。"
msgid "Standard container"
-msgstr ""
+msgstr "基本目錄"
-msgid "Strict to DLNA standard:"
-msgstr ""
+msgid "Strict to DLNA standard"
+msgstr "嚴格 DLNA 標準:"
msgid ""
"The miniDLNA service is active, serving %d audio, %d video and %d image "
"files."
-msgstr ""
+msgstr "miniDLNA æœå‹™æ­£åœ¨åŸ·è¡Œï¼Œæä¾› %d æ¢éŸ³è¨Šï¼Œ%d 個視訊和 %d 張圖片。"
msgid "The miniDLNA service is not running."
-msgstr ""
+msgstr "miniDLNA æœå‹™æœªåŸ·è¡Œã€‚"
msgid "This is a list of file names to check for when searching for album art."
-msgstr ""
+msgstr "這是一個檔å列表,用於æœå°‹å°ˆè¼¯å°é¢ã€‚"
msgid "Video"
-msgstr ""
+msgstr "視訊"
msgid "miniDLNA"
-msgstr ""
+msgstr "miniDLNA"
msgid "miniDLNA Status"
-msgstr ""
+msgstr "miniDLNA 狀態"
-msgid "miniSSDP socket:"
-msgstr ""
+msgid "miniSSDP socket"
+msgstr "miniSSDP socket:"
diff --git a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po
index 8b51f6ad4b..cfb2981b15 100644
--- a/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/zh-cn/mjpg-streamer.po
@@ -1,20 +1,24 @@
+#
+# maz-1 <ohmygod19993 at gmail dotcom>, 2015.
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: luci-app-mjpg-streamer\n"
"POT-Creation-Date: 2015-06-11 21:11+0100\n"
-"PO-Revision-Date: 2015-06-11 21:11+0100\n"
-"Last-Translator: maz-1 <ohmygod19993 at gmail dotcom>\n"
-"Language-Team: \n"
-"Language: zh-cn\n"
+"PO-Revision-Date: 2018-08-07 19:35+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.5.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-SourceCharset: UTF-8\n"
msgid "Allow ringbuffer to exceed limit by this amount"
-msgstr "å…许环形缓冲区最多超过这个数值"
+msgstr "å…许环形缓冲区超过这个值的é™åˆ¶"
msgid "Ask for username and password on connect"
msgstr "连接时询问用户å和密ç "
@@ -26,13 +30,13 @@ msgid "Auto"
msgstr "自动"
msgid "Automatic disabling of MJPEG mode"
-msgstr "自动ç¦ç”¨MJPEG模å¼"
+msgstr "自动ç¦ç”¨ MJPEG 模å¼"
msgid "Blink"
msgstr "é—ªçƒ"
msgid "Check to save the stream to an mjpeg file"
-msgstr "勾选以ä¿å­˜è§†é¢‘æµè‡³ä¸€ä¸ªmjpeg文件"
+msgstr "勾选以ä¿å­˜è§†é¢‘æµè‡³ mjpeg 文件"
msgid "Command to run"
msgstr "è¿è¡Œçš„命令"
@@ -41,19 +45,19 @@ msgid "Device"
msgstr "设备"
msgid "Do not initalize dynctrls of Linux-UVC driver"
-msgstr "ä¸è¦åˆå§‹åŒ–Linux-UVC驱动的dynctrls"
+msgstr "ä¸è¦åˆå§‹åŒ– Linux-UVC 驱动的 dynctrls"
msgid "Don't initalize dynctrls"
-msgstr "ä¸è¦åˆå§‹åŒ–dynctrls"
+msgstr "ä¸è¦åˆå§‹åŒ– dynctrls"
msgid "Drop frames smaller then this limit"
msgstr "丢弃å°äºŽè¯¥å°ºå¯¸é™åˆ¶çš„帧"
msgid "Enable MJPG-streamer"
-msgstr "å¯ç”¨MJPG-streamer"
+msgstr "å¯ç”¨ MJPG-streamer"
msgid "Enable YUYV format"
-msgstr "å¯ç”¨YUYVæ ¼å¼"
+msgstr "å¯ç”¨ YUYV æ ¼å¼"
msgid "Enabled"
msgstr "å¯ç”¨"
@@ -76,7 +80,7 @@ msgid "Folder"
msgstr "文件夹"
msgid "Folder that contains webpages"
-msgstr "ä¿å­˜ç½‘页的文件夹"
+msgstr "包å«ç½‘页的文件夹"
msgid "Frames per second"
msgstr "帧æ¯ç§’"
@@ -85,7 +89,7 @@ msgid "General"
msgstr "一般设置"
msgid "HTTP output"
-msgstr "HTTP输出"
+msgstr "HTTP 输出"
msgid "Input plugin"
msgstr "输入æ’件"
@@ -94,10 +98,10 @@ msgid "Interval between saving pictures"
msgstr "图片ä¿å­˜æ—¶é—´é—´éš”"
msgid "JPEG compression quality"
-msgstr "JPEG压缩å“è´¨"
+msgstr "JPEG 压缩å“è´¨"
msgid "Led control"
-msgstr "LED控制"
+msgstr "LED 控制"
msgid "MJPG-streamer"
msgstr "MJPG-streamer"
@@ -106,7 +110,7 @@ msgid "Max. number of pictures to hold"
msgstr "ä¿å­˜çš„图片数é‡ä¸Šé™"
msgid "Mjpeg output"
-msgstr "Mjpeg输出"
+msgstr "Mjpeg 输出"
msgid "Off"
msgstr "å…³"
@@ -146,20 +150,20 @@ msgstr "设置无用帧的最å°å°ºå¯¸ã€‚当光照ä¸è¶³æ—¶å¯èƒ½å‡ºçŽ°æ— ç”¨å¸§
msgid ""
"Set the quality in percent. This setting activates YUYV format, disables "
"MJPEG"
-msgstr "设置å“质(百分比)。此设置会开å¯YUYVæ ¼å¼è¾“出,关闭MJPEG输出。"
+msgstr "设置å“è´¨ï¼ˆç™¾åˆ†æ¯”ï¼‰ã€‚æ­¤è®¾ç½®ä¼šå¼€å¯ YUYV æ ¼å¼è¾“出,关闭 MJPEG 输出。"
msgid "TCP port for this HTTP server"
-msgstr "HTTPæœåŠ¡ç›‘å¬çš„TCP端å£"
+msgstr "HTTP æœåŠ¡ç›‘å¬çš„ TCP 端å£"
msgid "UVC input"
-msgstr "UVC输入"
+msgstr "UVC 输入"
msgid "Username"
msgstr "用户å"
msgid "WWW folder"
-msgstr "WWW文件夹"
+msgstr "WWW 文件夹"
msgid ""
"mjpg streamer is a streaming application for Linux-UVC compatible webcams"
-msgstr "mjpg streamer是一个视频æµç¨‹åºï¼Œç”¨äºŽå…¼å®¹Linux-UVCçš„æ‘„åƒå¤´ã€‚"
+msgstr "mjpg streamer 是一个视频æµç¨‹åºï¼Œç”¨äºŽ Linux-UVC 兼容的摄åƒå¤´ã€‚"
diff --git a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
new file mode 100644
index 0000000000..d7b969c841
--- /dev/null
+++ b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
@@ -0,0 +1,169 @@
+#
+# maz-1 <ohmygod19993 at gmail dotcom>, 2015.
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: luci-app-mjpg-streamer\n"
+"POT-Creation-Date: 2015-06-11 21:11+0100\n"
+"PO-Revision-Date: 2018-08-07 19:35+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+msgid "Allow ringbuffer to exceed limit by this amount"
+msgstr "å…許環形緩è¡å€è¶…éŽé€™å€‹å€¼çš„é™åˆ¶"
+
+msgid "Ask for username and password on connect"
+msgstr "連線時詢å•ä½¿ç”¨è€…å稱和密碼"
+
+msgid "Authentication required"
+msgstr "需è¦é©—è­‰"
+
+msgid "Auto"
+msgstr "自動"
+
+msgid "Automatic disabling of MJPEG mode"
+msgstr "自動ç¦ç”¨ MJPEG 模å¼"
+
+msgid "Blink"
+msgstr "é–ƒçˆ"
+
+msgid "Check to save the stream to an mjpeg file"
+msgstr "勾é¸ä»¥å„²å­˜è¦–訊æµè‡³ mjpeg 檔案"
+
+msgid "Command to run"
+msgstr "執行的指令"
+
+msgid "Device"
+msgstr "è£ç½®"
+
+msgid "Do not initalize dynctrls of Linux-UVC driver"
+msgstr "ä¸è¦åˆå§‹åŒ– Linux-UVC é©…å‹•çš„ dynctrls"
+
+msgid "Don't initalize dynctrls"
+msgstr "ä¸è¦åˆå§‹åŒ– dynctrls"
+
+msgid "Drop frames smaller then this limit"
+msgstr "丟棄å°æ–¼è©²å°ºå¯¸é™åˆ¶çš„å¹€"
+
+msgid "Enable MJPG-streamer"
+msgstr "啟用 MJPG-streamer"
+
+msgid "Enable YUYV format"
+msgstr "啟用 YUYV æ ¼å¼"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "Exceed"
+msgstr "超出"
+
+msgid ""
+"Execute command after saving picture. Mjpg-streamer parse the filename as "
+"first parameter to your script."
+msgstr "儲存圖片後執行指令。檔å將作為第一個引數傳éžçµ¦æŒ‡ä»¤ã€‚"
+
+msgid "File input"
+msgstr "檔案輸入"
+
+msgid "File output"
+msgstr "檔案輸出"
+
+msgid "Folder"
+msgstr "資料夾"
+
+msgid "Folder that contains webpages"
+msgstr "包å«ç¶²é çš„資料夾"
+
+msgid "Frames per second"
+msgstr "å¹€æ¯ç§’"
+
+msgid "General"
+msgstr "一般設定"
+
+msgid "HTTP output"
+msgstr "HTTP 輸出"
+
+msgid "Input plugin"
+msgstr "輸入外掛"
+
+msgid "Interval between saving pictures"
+msgstr "圖片儲存時間間隔"
+
+msgid "JPEG compression quality"
+msgstr "JPEG 壓縮å“質"
+
+msgid "Led control"
+msgstr "LED 控制"
+
+msgid "MJPG-streamer"
+msgstr "MJPG-streamer"
+
+msgid "Max. number of pictures to hold"
+msgstr "儲存的圖片數é‡ä¸Šé™"
+
+msgid "Mjpeg output"
+msgstr "Mjpeg 輸出"
+
+msgid "Off"
+msgstr "關"
+
+msgid "On"
+msgstr "é–‹"
+
+msgid "Output plugin"
+msgstr "輸出外掛"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Plugin settings"
+msgstr "外掛設定"
+
+msgid "Port"
+msgstr "埠"
+
+msgid "Resolution"
+msgstr "解æžåº¦"
+
+msgid "Ring buffer size"
+msgstr "環形緩è¡å€å¤§å°"
+
+msgid "Set folder to save pictures"
+msgstr "圖片儲存ä½ç½®"
+
+msgid "Set the inteval in millisecond"
+msgstr "設定時間間隔(毫秒)"
+
+msgid ""
+"Set the minimum size if the webcam produces small-sized garbage frames. May "
+"happen under low light conditions"
+msgstr "設定無用幀的最å°å°ºå¯¸ã€‚當光照ä¸è¶³æ™‚å¯èƒ½å‡ºç¾ç„¡ç”¨å¹€ã€‚"
+
+msgid ""
+"Set the quality in percent. This setting activates YUYV format, disables "
+"MJPEG"
+msgstr "設定å“質(百分比)。此設定會開啟 YUYV æ ¼å¼è¼¸å‡ºï¼Œé—œé–‰ MJPEG 輸出。"
+
+msgid "TCP port for this HTTP server"
+msgstr "HTTP æœå‹™ç›£è½çš„ TCP 埠"
+
+msgid "UVC input"
+msgstr "UVC 輸入"
+
+msgid "Username"
+msgstr "使用者å稱"
+
+msgid "WWW folder"
+msgstr "WWW 資料夾"
+
+msgid ""
+"mjpg streamer is a streaming application for Linux-UVC compatible webcams"
+msgstr "mjpg streamer 是一個視訊æµç¨‹å¼ï¼Œç”¨æ–¼ Linux-UVC 相容的æ”åƒé ­ã€‚"
diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
index 2d46953e55..d2d7422a6b 100644
--- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
+++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua
@@ -101,6 +101,10 @@ function diagnosticsData(interface, task)
if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then
local util = io.popen(cmd %{ut.shellquote(device), ut.shellquote(addr)})
if util then
+ luci.http.write("Command:\n")
+ luci.http.write(cmd %{ut.shellquote(device),
+ ut.shellquote(addr)} .. "\n\n")
+ luci.http.write("Result:\n")
while true do
local ln = util:read("*l")
if not ln then break end
@@ -140,7 +144,8 @@ function diagnosticsData(interface, task)
local uci = require "luci.model.uci".cursor(nil, "/var/state")
local nw = require "luci.model.network".init()
local network = nw:get_network(interface)
- local device = network and network:ifname()
+ local device = network and network:get_interface()
+ device = device:name()
luci.http.prepare_content("text/plain")
if device then
@@ -150,7 +155,7 @@ function diagnosticsData(interface, task)
diag_command("ping -I %s -c 5 -W 1 %s 2>&1", device, gateway)
else
luci.http.prepare_content("text/plain")
- luci.http.write(string.format("No gateway for interface %s found.", interface))
+ luci.http.write(translatef("No gateway for interface %s found.", interface))
end
elseif task == "ping_trackips" then
local trackips = uci:get("mwan3", interface, "track_ip")
@@ -159,7 +164,7 @@ function diagnosticsData(interface, task)
diag_command("ping -I %s -c 5 -W 1 %s 2>&1", device, trackips[i])
end
else
- luci.http.write(string.format("No tracking Hosts for interface %s defined.", interface))
+ luci.http.write(translatef("No tracking Hosts for interface %s defined.", interface))
end
elseif task == "check_rules" then
local number = getInterfaceNumber(interface)
@@ -168,30 +173,30 @@ function diagnosticsData(interface, task)
local iif_rule = sys.exec(string.format("ip rule | grep %d", iif))
local fwmark_rule = sys.exec(string.format("ip rule | grep %d", fwmark))
if iif_rule ~= "" and fwmark_rule ~= "" then
- luci.http.write(string.format("All required IP rules for interface %s found", interface))
+ luci.http.write(translatef("All required IP rules for interface %s found", interface))
luci.http.write("\n")
luci.http.write(fwmark_rule)
luci.http.write(iif_rule)
elseif iif_rule == "" and fwmark_rule ~= "" then
- luci.http.write(string.format("Only one IP rules for interface %s found", interface))
+ luci.http.write(translatef("Only one IP rules for interface %s found", interface))
luci.http.write("\n")
luci.http.write(fwmark_rule)
elseif iif_rule ~= "" and fwmark_rule == "" then
- luci.http.write(string.format("Only one IP rules for interface %s found", interface))
+ luci.http.write(translatef("Only one IP rules for interface %s found", interface))
luci.http.write("\n")
luci.http.write(iif_rule)
else
- luci.http.write(string.format("Missing both IP rules for interface %s", interface))
+ luci.http.write(translatef("Missing both IP rules for interface %s", interface))
end
elseif task == "check_routes" then
local number = getInterfaceNumber(interface)
local routeTable = sys.exec(string.format("ip route list table %s", number))
if routeTable ~= "" then
- luci.http.write(string.format("Routing table %s for interface %s found", number, interface))
+ luci.http.write(translatef("Routing table %s for interface %s found", number, interface))
luci.http.write("\n")
luci.http.write(routeTable)
else
- luci.http.write(string.format("Routing table %s for interface %s not found", number, interface))
+ luci.http.write(translatef("Routing table %s for interface %s not found", number, interface))
end
elseif task == "hotplug_ifup" then
os.execute(string.format("/usr/sbin/mwan3 ifup %s", ut.shellquote(interface)))
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index a6570e341c..d01945bf4a 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -13,10 +13,8 @@ mwan_interface = m5:section(NamedSection, arg[1], "interface", "")
mwan_interface.addremove = false
mwan_interface.dynamic = false
-enabled = mwan_interface:option(ListValue, "enabled", translate("Enabled"))
-enabled.default = "1"
-enabled:value("1", translate("Yes"))
-enabled:value("0", translate("No"))
+enabled = mwan_interface:option(Flag, "enabled", translate("Enabled"))
+enabled.default = false
initial_state = mwan_interface:option(ListValue, "initial_state", translate("Initial state"),
translate("Expect interface state on up event"))
diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index a5826926dd..8a1cad2f6b 100644
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -40,6 +40,9 @@ msgstr "利用å¯èƒ½ãªå€¤: 1-1000。空欄ã®å ´åˆã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯1ã§ã™
msgid "Acceptable values: 1-256. Defaults to 1 if not set"
msgstr "利用å¯èƒ½ãªå€¤: 1-256。空欄ã®å ´åˆã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¯1ã§ã™ã€‚"
+msgid "All required IP rules for interface %s found"
+msgstr ""
+
msgid "Check IP rules"
msgstr "IP ルールã®ãƒã‚§ãƒƒã‚¯"
@@ -263,6 +266,9 @@ msgstr "最å°ãƒ‘ケットレイテンシ [ms]"
msgid "Min packet loss [%]"
msgstr "最å°ãƒ‘ケットロス [%]"
+msgid "Missing both IP rules for interface %s"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
@@ -276,6 +282,12 @@ msgstr "ã„ã„ãˆ"
msgid "No MWAN interfaces found"
msgstr "MWAN インターフェースãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+msgid "No gateway for interface %s found."
+msgstr ""
+
+msgid "No tracking Hosts for interface %s defined."
+msgstr ""
+
msgid "Notification"
msgstr "通知"
@@ -285,6 +297,9 @@ msgstr "オフライン"
msgid "Online"
msgstr "オンライン"
+msgid "Only one IP rules for interface %s found"
+msgstr ""
+
msgid "Ping count"
msgstr "Ping 回数"
@@ -342,6 +357,12 @@ msgstr "プロトコル"
msgid "Recovery interval"
msgstr "障害復旧 インターãƒãƒ«"
+msgid "Routing table %s for interface %s found"
+msgstr ""
+
+msgid "Routing table %s for interface %s not found"
+msgstr ""
+
msgid "Rule"
msgstr "ルール"
diff --git a/applications/luci-app-mwan3/po/ru/mwan3.po b/applications/luci-app-mwan3/po/ru/mwan3.po
index 140c537e73..4d52d7108c 100644
--- a/applications/luci-app-mwan3/po/ru/mwan3.po
+++ b/applications/luci-app-mwan3/po/ru/mwan3.po
@@ -43,6 +43,9 @@ msgstr "ДопуÑтимые значениÑ: 1-1000. По умолчанию 1
msgid "Acceptable values: 1-256. Defaults to 1 if not set"
msgstr "ДопуÑтимые значениÑ: 1-256 По умолчанию 1, еÑли значение не задано."
+msgid "All required IP rules for interface %s found"
+msgstr ""
+
msgid "Check IP rules"
msgstr "Проверить правила IP"
@@ -262,6 +265,9 @@ msgstr ""
msgid "Min packet loss [%]"
msgstr ""
+msgid "Missing both IP rules for interface %s"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
@@ -275,6 +281,12 @@ msgstr "Ðет"
msgid "No MWAN interfaces found"
msgstr "ИнтерфейÑÑ‹ MWAN не найдены"
+msgid "No gateway for interface %s found."
+msgstr ""
+
+msgid "No tracking Hosts for interface %s defined."
+msgstr ""
+
msgid "Notification"
msgstr "УведомлениÑ"
@@ -284,6 +296,9 @@ msgstr "Отключен"
msgid "Online"
msgstr "Онлайн"
+msgid "Only one IP rules for interface %s found"
+msgstr ""
+
msgid "Ping count"
msgstr "Кол-во пинг-запроÑов"
@@ -341,6 +356,12 @@ msgstr "Протокол"
msgid "Recovery interval"
msgstr "Интервал воÑÑтановлениÑ"
+msgid "Routing table %s for interface %s found"
+msgstr ""
+
+msgid "Routing table %s for interface %s not found"
+msgstr ""
+
msgid "Rule"
msgstr "Правило"
diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot
index bcc5e977a5..e815afd1f0 100644
--- a/applications/luci-app-mwan3/po/templates/mwan3.pot
+++ b/applications/luci-app-mwan3/po/templates/mwan3.pot
@@ -27,6 +27,9 @@ msgstr ""
msgid "Acceptable values: 1-256. Defaults to 1 if not set"
msgstr ""
+msgid "All required IP rules for interface %s found"
+msgstr ""
+
msgid "Check IP rules"
msgstr ""
@@ -231,6 +234,9 @@ msgstr ""
msgid "Min packet loss [%]"
msgstr ""
+msgid "Missing both IP rules for interface %s"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
@@ -242,6 +248,12 @@ msgstr ""
msgid "No MWAN interfaces found"
msgstr ""
+msgid "No gateway for interface %s found."
+msgstr ""
+
+msgid "No tracking Hosts for interface %s defined."
+msgstr ""
+
msgid "Notification"
msgstr ""
@@ -251,6 +263,9 @@ msgstr ""
msgid "Online"
msgstr ""
+msgid "Only one IP rules for interface %s found"
+msgstr ""
+
msgid "Ping count"
msgstr ""
@@ -300,6 +315,12 @@ msgstr ""
msgid "Recovery interval"
msgstr ""
+msgid "Routing table %s for interface %s found"
+msgstr ""
+
+msgid "Routing table %s for interface %s not found"
+msgstr ""
+
msgid "Rule"
msgstr ""
diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
index e730004d97..4fd6817407 100644
--- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-28 16:58+0800\n"
+"PO-Revision-Date: 2018-08-08 08:31+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "%d hour"
@@ -38,6 +38,9 @@ msgstr "å–值范围:1-1000。如果ä¸å¡«å†™ï¼Œé»˜è®¤å€¼ä¸º 1"
msgid "Acceptable values: 1-256. Defaults to 1 if not set"
msgstr "å–值范围:1-256。如果ä¸å¡«å†™ï¼Œé»˜è®¤å€¼ä¸º 1"
+msgid "All required IP rules for interface %s found"
+msgstr ""
+
msgid "Check IP rules"
msgstr "检查 IP 规则"
@@ -48,7 +51,7 @@ msgid "Check routing table"
msgstr "检查路由表"
msgid "Collecting data..."
-msgstr "正在收集数æ®..."
+msgstr "正在收集数æ®â€¦"
msgid "Destination address"
msgstr "目标地å€"
@@ -187,13 +190,13 @@ msgid "MWAN Rule Configuration - %s"
msgstr "MWAN 规则é…ç½® - %s"
msgid "MWAN Status - Detail"
-msgstr "MWAN Status - 详细"
+msgstr "MWAN çŠ¶æ€ - 详细"
msgid "MWAN Status - Diagnostics"
-msgstr "MWAN Status - 诊断"
+msgstr "MWAN çŠ¶æ€ - 诊断"
msgid "MWAN Status - Troubleshooting"
-msgstr "MWAN Status - 故障排除"
+msgstr "MWAN çŠ¶æ€ - 故障排除"
msgid ""
"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN "
@@ -218,8 +221,8 @@ msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
msgstr ""
-"å¯ä»¥è¾“入一个或多个端å£ï¼ˆä¾‹å¦‚“22â€æˆ–者“80,443â€ï¼‰æˆ–者是一个端å£èŒƒå›´ï¼ˆä¾‹"
-"如“1024:2048â€ï¼‰ä¸å«å¼•å·"
+"å¯ä»¥è¾“入一个或多个端å£ï¼ˆä¾‹å¦‚“22â€æˆ–者“80,443â€ï¼‰ï¼Œæˆ–者是一个端å£èŒƒå›´ï¼ˆä¾‹"
+"如“1024:2048â€ï¼‰ï¼Œä¸å«å¼•å·"
msgid "Member"
msgstr "æˆå‘˜"
@@ -251,6 +254,9 @@ msgstr "最å°æ•°æ®åŒ…延迟 [ms]"
msgid "Min packet loss [%]"
msgstr "最å°æ•°æ®åŒ…丢失率 [%]"
+msgid "Missing both IP rules for interface %s"
+msgstr ""
+
msgid ""
"Name of IPset rule. Requires IPset rule in /etc/dnsmasq.conf (eg \"ipset=/"
"youtube.com/youtube\")"
@@ -264,6 +270,12 @@ msgstr "å¦"
msgid "No MWAN interfaces found"
msgstr "没有找到 MWAN 接å£"
+msgid "No gateway for interface %s found."
+msgstr ""
+
+msgid "No tracking Hosts for interface %s defined."
+msgstr ""
+
msgid "Notification"
msgstr "通知"
@@ -273,6 +285,9 @@ msgstr "离线"
msgid "Online"
msgstr "在线"
+msgid "Only one IP rules for interface %s found"
+msgstr ""
+
msgid "Ping count"
msgstr "Ping 计数"
@@ -327,6 +342,12 @@ msgstr "通信åè®®"
msgid "Recovery interval"
msgstr "æ•…éšœæ¢å¤é—´éš”"
+msgid "Routing table %s for interface %s found"
+msgstr ""
+
+msgid "Routing table %s for interface %s not found"
+msgstr ""
+
msgid "Rule"
msgstr "规则"
@@ -348,7 +369,7 @@ msgstr ""
">规则从上到下匹é…<br />匹é…规则以下的规则被忽略<br />ä¸ç¬¦åˆä»»ä½•è§„则的æµé‡å°†ä½¿"
"用主路由表进行路由<br />目的地为已知(éžé»˜è®¤ï¼‰ç½‘络的æµé‡ç”±ä¸»è·¯ç”±è¡¨å¤„ç†<br />"
"æµé‡ç¬¦åˆè§„则,但该策略的所有 WAN 接å£å…³é—­åŽéƒ½ä¼šè¢«å¤±æ•ˆ<br />å称å¯åŒ…å«å­—符 A-"
-"Z,a-z,0-9,_和空格<br />规则ä¸èƒ½ä¸Žé…置的接å£ã€æˆå‘˜æˆ–策略共享相åŒçš„å称"
+"Z,a-z,0-9,_ 和空格<br />规则ä¸èƒ½ä¸Žé…置的接å£ã€æˆå‘˜æˆ–策略共享相åŒçš„å称"
msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
msgstr "å•ä½ä¸ºç§’。接å—的值:1-1000000。留空则使用默认值 600 秒"
@@ -405,9 +426,9 @@ msgstr ""
"须是 &#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 å¯åŠ¨æˆ–åœæ­¢æŽ¥å£çš„物ç†è®¾å¤‡å(例如 "
-"“eth0†或 “wwan0â€ï¼‰<br /><br />"
+"脚本。<br /><br />$ACTION “ifupâ€æˆ–“ifdownâ€<br />$INTERFACE å¯åŠ¨æˆ–åœæ­¢çš„接å£å"
+"(例如“wanâ€æˆ–“wwanâ€ï¼‰<br />$DEVICE å¯åŠ¨æˆ–åœæ­¢æŽ¥å£çš„物ç†è®¾å¤‡å(例"
+"如“eth0â€æˆ–“wwan0â€ï¼‰<br /><br />"
msgid "Tracking hostname or IP address"
msgstr "跟踪的主机或 IP 地å€"
@@ -462,7 +483,7 @@ msgid ""
msgstr "警告:规则 %s 有一个端å£é…置没有指定或åè®®ä¸æ­£ç¡®ï¼"
msgid "Waiting for command to complete..."
-msgstr "正在等待命令完æˆ..."
+msgstr "正在等待命令完æˆâ€¦"
msgid "Weight"
msgstr "比é‡"
diff --git a/applications/luci-app-mwan3/po/zh-tw/mwan3.po b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
index 9fa5263428..bb17b559d2 100644
--- a/applications/luci-app-mwan3/po/zh-tw/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-tw/mwan3.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-28 16:58+0800\n"
+"PO-Revision-Date: 2018-08-08 08:31+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "%d hour"
@@ -30,7 +30,7 @@ msgid ""
"Acceptable values: 1-100. This many Tracking IP addresses must respond for "
"the link to be deemed up"
msgstr ""
-"å–值範åœï¼š1-100。這個設定項指定了當多少個 IP ä½å€èƒ½å¤ é€£é€šæ™‚介é¢æœƒè¢«èªç‚ºç·šä¸Š"
+"å–值範åœï¼š1-100。這個設定項指定了當多少個 IP ä½å€èƒ½å¤ é€£é€šæ™‚介é¢æœƒè¢«èªç‚ºåœ¨ç·š"
msgid "Acceptable values: 1-1000. Defaults to 1 if not set"
msgstr "å–值範åœï¼š1-1000。如果ä¸å¡«å¯«ï¼Œé è¨­å€¼ç‚º 1"
@@ -38,17 +38,20 @@ msgstr "å–值範åœï¼š1-1000。如果ä¸å¡«å¯«ï¼Œé è¨­å€¼ç‚º 1"
msgid "Acceptable values: 1-256. Defaults to 1 if not set"
msgstr "å–值範åœï¼š1-256。如果ä¸å¡«å¯«ï¼Œé è¨­å€¼ç‚º 1"
+msgid "All required IP rules for interface %s found"
+msgstr ""
+
msgid "Check IP rules"
msgstr "檢查 IP è¦å‰‡"
msgid "Check link quality"
-msgstr ""
+msgstr "檢查連線數é‡"
msgid "Check routing table"
msgstr "檢查路由表"
msgid "Collecting data..."
-msgstr "正在收集資料..."
+msgstr "正在收集資料…"
msgid "Destination address"
msgstr "目標ä½å€"
@@ -57,7 +60,7 @@ msgid "Destination port"
msgstr "目標埠"
msgid "Detail"
-msgstr ""
+msgstr "詳細"
msgid "Diagnostics"
msgstr "診斷"
@@ -76,7 +79,7 @@ msgid "Enter value in hex, starting with <code>0x</code>"
msgstr "輸入å六進ä½åˆ¶å€¼ï¼Œä»¥ <code>0x</code> é–‹é ­"
msgid "Execute"
-msgstr ""
+msgstr "執行"
msgid "Expect interface state on up event"
msgstr "在 up 事件發生時的é æœŸä»‹é¢ç‹€æ…‹"
@@ -103,7 +106,7 @@ msgid "Hotplug ifup"
msgstr "Hotplug ifup"
msgid "INFO: MWAN not running"
-msgstr ""
+msgstr "資訊:MWAN 沒有é‹è¡Œ"
msgid "IPset"
msgstr "IPset"
@@ -124,7 +127,7 @@ msgid "Interface down"
msgstr "介é¢é›¢ç·š"
msgid "Interface up"
-msgstr "介é¢ç·šä¸Š"
+msgstr "介é¢åœ¨ç·š"
msgid "Interface will be deemed down after this many failed ping tests"
msgstr "當 Ping 失敗次數é”到這個數值後,介é¢æœƒè¢«èªç‚ºé›¢ç·š"
@@ -154,28 +157,28 @@ msgid "Local source interface"
msgstr "本地æºä»‹é¢"
msgid "MWAN - Globals"
-msgstr ""
+msgstr "MWAN - 全局"
msgid "MWAN - Interfaces"
-msgstr ""
+msgstr "MWAN - 介é¢"
msgid "MWAN - Members"
-msgstr ""
+msgstr "MWAN - æˆå“¡"
msgid "MWAN - Notification"
-msgstr ""
+msgstr "MWAN - 通知"
msgid "MWAN - Policies"
-msgstr ""
+msgstr "MWAN - ç­–ç•¥"
msgid "MWAN - Rules"
-msgstr ""
+msgstr "MWAN - è¦å‰‡"
msgid "MWAN Interface Configuration - %s"
msgstr "MWAN 介é¢é…ç½® - %s"
msgid "MWAN Interfaces"
-msgstr ""
+msgstr "MWAN 介é¢"
msgid "MWAN Member Configuration - %s"
msgstr "MWAN æˆå“¡é…ç½® - %s"
@@ -187,13 +190,13 @@ msgid "MWAN Rule Configuration - %s"
msgstr "MWAN è¦å‰‡é…ç½® - %s"
msgid "MWAN Status - Detail"
-msgstr ""
+msgstr "MWAN 狀態 - 詳細"
msgid "MWAN Status - Diagnostics"
-msgstr ""
+msgstr "MWAN 狀態 - 診斷"
msgid "MWAN Status - Troubleshooting"
-msgstr ""
+msgstr "MWAN 狀態 - 故障排除"
msgid ""
"MWAN supports up to 252 physical and/or logical interfaces<br />MWAN "
@@ -209,17 +212,17 @@ msgstr ""
"介é¢ä¸æ‡‰è©²èˆ‡æˆå“¡ã€ç­–ç•¥ã€è¦å‰‡ä¸­çš„ä»»æ„一個設定項使用相åŒçš„å稱"
msgid "Max packet latency [ms]"
-msgstr ""
+msgstr "æœ€å¤§è³‡æ–™åŒ…å»¶é² [ms]"
msgid "Max packet loss [%]"
-msgstr ""
+msgstr "最大資料包丟失率 [%]"
msgid ""
"May be entered as a single or multiple port(s) (eg \"22\" or \"80,443\") or "
"as a portrange (eg \"1024:2048\") without quotes"
msgstr ""
-"å¯ä»¥è¼¸å…¥ä¸€å€‹æˆ–多個埠(例如“22â€æˆ–者“80,443â€ï¼‰æˆ–者是一個埠範åœï¼ˆä¾‹"
-"如“1024:2048â€ï¼‰ä¸å«å¼•è™Ÿ"
+"å¯ä»¥è¼¸å…¥ä¸€å€‹æˆ–多個埠(例如“22â€æˆ–者“80,443â€ï¼‰ï¼Œæˆ–者是一個埠範åœï¼ˆä¾‹"
+"如“1024:2048â€ï¼‰ï¼Œä¸å«å¼•è™Ÿ"
msgid "Member"
msgstr "æˆå“¡"
@@ -246,9 +249,12 @@ msgid "Metric"
msgstr "èºé»žæ•¸"
msgid "Min packet latency [ms]"
-msgstr ""
+msgstr "最å°è³‡æ–™åŒ…å»¶é² [ms]"
msgid "Min packet loss [%]"
+msgstr "最å°è³‡æ–™åŒ…丟失率 [%]"
+
+msgid "Missing both IP rules for interface %s"
msgstr ""
msgid ""
@@ -264,14 +270,23 @@ msgstr "å¦"
msgid "No MWAN interfaces found"
msgstr "沒有找到 MWAN 介é¢"
-msgid "Notification"
+msgid "No gateway for interface %s found."
+msgstr ""
+
+msgid "No tracking Hosts for interface %s defined."
msgstr ""
+msgid "Notification"
+msgstr "通知"
+
msgid "Offline"
msgstr "離線"
msgid "Online"
-msgstr "線上"
+msgstr "在線"
+
+msgid "Only one IP rules for interface %s found"
+msgstr ""
msgid "Ping count"
msgstr "Ping 計數"
@@ -312,8 +327,8 @@ msgstr ""
"“策略â€æŠŠæˆå“¡é€²è¡Œåˆ†çµ„,告訴 MWAN 如何分é…“è¦å‰‡â€ä¸­ä½¿ç”¨é€™ä¸€ç­–略的æµé‡<br />æ“有"
"較低èºé»žæ•¸çš„æˆå“¡å°‡æœƒè¢«å„ªå…ˆä½¿ç”¨ã€‚æ“有相åŒèºé»žæ•¸çš„æˆå“¡æŠŠæµé‡é€²è¡Œè² è¼‰å‡è¡¡ã€‚<br /"
">進行負載å‡è¡¡çš„æˆå“¡ä¹‹é–“æ“有較高比é‡çš„æˆå“¡å°‡æœƒè¢«åˆ†é…到更多æµé‡ã€‚<br />å稱å…許"
-"包括A-Zã€a-zã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚å稱應該在 15 個字元以內<br />ç­–ç•¥ä¸æ‡‰è©²"
-"與介é¢ã€æˆå“¡ã€è¦å‰‡ä¸­çš„ä»»æ„一個設定項使用相åŒçš„å稱"
+"包括 A-Zã€a-zã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚å稱應該在 15 個字元以內<br />ç­–ç•¥ä¸æ‡‰"
+"該與介é¢ã€æˆå“¡ã€è¦å‰‡ä¸­çš„ä»»æ„一個設定項使用相åŒçš„å稱"
msgid "Policy"
msgstr "ç­–ç•¥"
@@ -327,6 +342,12 @@ msgstr "通訊å”è­°"
msgid "Recovery interval"
msgstr "æ•…éšœæ¢å¾©é–“éš”"
+msgid "Routing table %s for interface %s found"
+msgstr ""
+
+msgid "Routing table %s for interface %s not found"
+msgstr ""
+
msgid "Rule"
msgstr "è¦å‰‡"
@@ -344,6 +365,11 @@ 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 />ä¸ç¬¦åˆä»»ä½•è¦å‰‡çš„æµé‡å°‡ä½¿"
+"用主路由表進行路由<br />目的地為已知(éžé è¨­ï¼‰ç¶²è·¯çš„æµé‡ç”±ä¸»è·¯ç”±è¡¨è™•ç†<br />"
+"æµé‡ç¬¦åˆè¦å‰‡ï¼Œä½†è©²ç­–略的所有 WAN 介é¢é—œé–‰å¾Œéƒ½æœƒè¢«å¤±æ•ˆ<br />å稱å¯åŒ…å«å­—å…ƒ A-"
+"Z,a-z,0-9,_ 和空格<br />è¦å‰‡ä¸èƒ½èˆ‡é…置的介é¢ã€æˆå“¡æˆ–策略共享相åŒçš„å稱"
msgid "Seconds. Acceptable values: 1-1000000. Defaults to 600 if not set"
msgstr "å–®ä½ç‚ºç§’。接å—的值:1-1000000。留空則使用é è¨­å€¼ 600 秒"
@@ -364,7 +390,7 @@ msgid "Supports CIDR notation (eg \"192.168.100.0/24\") without quotes"
msgstr "æ”¯æ´ CIDR 記法(例如:\"192.168.100.0/24\")ä¸å«å¼•è™Ÿ"
msgid "Task"
-msgstr ""
+msgstr "任務"
msgid "There are currently %d of %d supported interfaces configured"
msgstr "當å‰å·²é…ç½® %d 個介é¢ï¼Œæœ€å¤§æ”¯æ´ %d 個"
@@ -376,7 +402,7 @@ msgstr "這裡顯示了這個介é¢åœ¨ /etc/config/network 中é…置的èºé»žæ•¸
msgid ""
"This hostname or IP address will be pinged to determine if the link is up or "
"down. Leave blank to assume interface is always online"
-msgstr "é€šéŽ ping 此主機或 IP ä½å€ä¾†ç¢ºå®šéˆè·¯æ˜¯å¦ç·šä¸Šã€‚留空則èªç‚ºä»‹é¢å§‹çµ‚線上"
+msgstr "é€šéŽ ping 此主機或 IP ä½å€ä¾†ç¢ºå®šéˆè·¯æ˜¯å¦åœ¨ç·šã€‚留空則èªç‚ºä»‹é¢å§‹çµ‚在線"
msgid ""
"This section allows you to modify the content of \"/etc/mwan3.user\".<br /"
@@ -395,6 +421,14 @@ msgid ""
"Physical device name which interface went up or down (e.g. \"eth0\" or "
"\"wwan0\")<br /><br />"
msgstr ""
+"這裡å…許您修改“/etc/mwan3.userâ€çš„內容。<br />該檔案在 sysupgrade 期間也會ä¿"
+"留。<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 啟動或åœæ­¢ä»‹é¢çš„物ç†è£ç½®å(例"
+"如“eth0â€æˆ–“wwan0â€ï¼‰<br /><br />"
msgid "Tracking hostname or IP address"
msgstr "跟蹤的主機或 IP ä½å€"
@@ -421,35 +455,35 @@ msgid ""
msgstr "使用該介é¢çš„ IP ä½å€ä½œç‚ºè·¯ç”±å™¨æœ¬èº«ç™¼èµ·çš„æµé‡çš„æº IP ä½å€"
msgid "View the content of /etc/protocols for protocol description"
-msgstr ""
+msgstr "檢視å”è­°æè¿°çš„ /etc/protocols 的內容"
msgid "WARNING: %d interfaces are configured exceeding the maximum of %d!"
msgstr "警告:已é…ç½® %d 個介é¢ï¼Œè¶…éŽæœ€å¤§å€¼ %dï¼"
msgid "WARNING: Interface %s are not found in /etc/config/network"
-msgstr ""
+msgstr "è­¦å‘Šï¼šä»‹é¢ %s 在 /etc/config/network 中未找到"
msgid "WARNING: Interface %s has a duplicate metric %s configured"
-msgstr ""
+msgstr "è­¦å‘Šï¼šä»‹é¢ %s çš„ metric %s é…ç½®é‡è¤‡"
msgid ""
"WARNING: Interface %s has a higher reliability requirement than tracking "
"hosts (%d)"
-msgstr ""
+msgstr "è­¦å‘Šï¼šä»‹é¢ %s 比跟蹤主機具有更高的å¯é æ€§è¦æ±‚(%d)"
msgid "WARNING: Interface %s has no default route in the main routing table"
-msgstr ""
+msgstr "è­¦å‘Šï¼šä»‹é¢ %s 在主路由表中沒有é è¨­çš„路由"
msgid "WARNING: Policy %s has exceeding the maximum name of 15 characters"
-msgstr ""
+msgstr "警告:策略 %s åç¨±è¶…éŽ 15 個字元"
msgid ""
"WARNING: Rule %s have a port configured with no or improper protocol "
"specified!"
-msgstr ""
+msgstr "警告:è¦å‰‡ %s 有一個埠é…置沒有指定或å”è­°ä¸æ­£ç¢ºï¼"
msgid "Waiting for command to complete..."
-msgstr ""
+msgstr "正在等待指令完æˆâ€¦"
msgid "Weight"
msgstr "比é‡"
@@ -510,9 +544,9 @@ msgstr "ä¸å¯é”(拒絕)"
#~ "的第一行必須是&#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 啟動或åœæ­¢ä»‹é¢çš„物ç†è£"
-#~ "ç½®å(例如“eth0â€æˆ–“wwan0â€ï¼‰<br /><br />"
+#~ "數傳éžçµ¦é€™å€‹æŒ‡ä»¤ç¢¼ã€‚<br /><br />$ACTION “ifupâ€æˆ–“ifdownâ€<br />$INTERFACE "
+#~ "啟動或åœæ­¢çš„介é¢å(例如“wanâ€æˆ–“wwanâ€ï¼‰<br />$DEVICE 啟動或åœæ­¢ä»‹é¢çš„物ç†"
+#~ "è£ç½®å(例如“eth0â€æˆ–“wwan0â€ï¼‰<br /><br />"
#~ msgid "Currently Configured Interfaces"
#~ msgstr "當å‰é…置的介é¢"
@@ -599,8 +633,8 @@ msgstr "ä¸å¯é”(拒絕)"
#~ "略。ä¸åŒ¹é…任何è¦å‰‡çš„通訊將會由系統é è¨­è·¯ç”±è¡¨é€²è¡Œã€‚<br />來自已知的網路的轉"
#~ "發æµé‡ç”±ç³»çµ±é è¨­è·¯ç”±è¡¨æŽ¥æ‰‹ï¼Œç„¶å¾Œ MWAN 從中匹é…出相應的æµé‡ä¸¦è½‰ç§»åˆ° MWAN 自"
#~ "己的路由表。但是所有被劃分到一個無法使用的策略的æµé‡å°‡æœƒç„¡æ³•æ­£å¸¸é€²è¡Œè·¯ç”±ã€‚"
-#~ "<br />å稱å…許包括A-Zã€a-zã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚<br />è¦å‰‡ä¸æ‡‰è©²èˆ‡ä»‹"
-#~ "é¢ã€æˆå“¡ã€ç­–略中的任æ„一個設定項使用相åŒçš„å稱"
+#~ "<br />å稱å…許包括A-Zã€a-zã€0-9ã€_ 但是ä¸èƒ½æœ‰ç©ºæ ¼ã€‚<br />è¦å‰‡ä¸æ‡‰è©²èˆ‡æŽ¥"
+#~ "å£ã€æˆå“¡ã€ç­–略中的任æ„一個設定項使用相åŒçš„å稱"
#~ msgid "Start MWAN"
#~ msgstr "å•Ÿå‹• MWAN"
@@ -749,7 +783,7 @@ msgstr "ä¸å¯é”(拒絕)"
#~ "$DEVICE is the device name attached to the interface (eth0.1, eth1, etc.)"
#~ msgstr ""
#~ "這裡å…許您修改 /etc/hotplug.d/iface/16-mwancustom 的內容<br />這å¯ä»¥åœ¨æŽ¥"
-#~ "å£ ifup 或 ifdown Hotplug 事件時執行系統命令或指令碼<br /><br />注æ„:<br /"
+#~ "å£ ifup 或 ifdown Hotplug 事件時執行系統指令或指令碼<br /><br />注æ„:<br /"
#~ ">指令碼的第一行必須是 &#34;#!/bin/sh&#34; ä¸å«å¼•è™Ÿ<br />以#開頭的行是註"
#~ "釋,ä¸æœƒåŸ·è¡Œ<br /><br />å¯ç”¨è®Šæ•¸:<br />$ACTION 是 Hotplug 事件(ifup, "
#~ "ifdown)<br />$INTERFACE 是介é¢å稱(wan1ã€wan2 等)<br />$DEVICE 是連線到"
diff --git a/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
index 54fb3f6498..63dbc08350 100644
--- a/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
+++ b/applications/luci-app-nlbwmon/po/zh-cn/nlbwmon.po
@@ -1,20 +1,30 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\n"
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 19:48+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "%d IPv4-only hosts"
-msgstr "%d ä¸ªä¸»æœºä»…æ”¯æŒ IPv4"
+msgstr "%d å°ä»… IPv4 主机"
msgid "%d IPv6-only hosts"
-msgstr "%d ä¸ªä¸»æœºä»…æ”¯æŒ IPv6"
+msgstr "%d å°ä»… IPv6 主机"
msgid "%d dual-stack hosts"
-msgstr "%d 个åŒå议栈主机"
+msgstr "%d å°åŒå议栈主机"
msgid "%s and %s"
msgstr "%s 和 %s"
msgid "%s, %s and %s"
-msgstr "%s, %s 和 %s"
+msgstr "%s,%s 和 %s"
msgid "-1 - Restart every last day of month"
msgstr "-1 - æ¯æœˆçš„最åŽä¸€å¤©é‡æ–°å¼€å§‹"
@@ -62,16 +72,16 @@ msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
msgstr "IPv6 总上传é‡ï¼š<big id=\"ipv6-tx\">0B</big>"
msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
-msgstr "<big id=\"layer7-most-conn\">0</big> 是连接数最多的åè®®"
+msgstr "连接数最多的å议:<big id=\"layer7-most-conn\">0</big>"
msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
-msgstr "<big id=\"layer7-most-rx\">0</big> 是下载é‡æœ€å¤§çš„åè®®"
+msgstr "下载é‡æœ€å¤§çš„å议:<big id=\"layer7-most-rx\">0</big>"
msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
-msgstr "<big id=\"layer7-most-tx\">0</big> 是上传é‡æœ€å¤§çš„åè®®"
+msgstr "上传é‡æœ€å¤§çš„å议:<big id=\"layer7-most-tx\">0</big>"
msgid "<big id=\"layer7-total\">0</big> different application protocols"
-msgstr "<big id=\"layer7-total\">0</big> ç§ä¸åŒçš„应用层åè®®"
+msgstr "应用层å议计数:<big id=\"layer7-total\">0</big>"
msgid "<big id=\"rx-total\">0</big> download"
msgstr "下载:<big id=\"rx-total\">0</big>"
@@ -86,7 +96,7 @@ msgid "Advanced Settings"
msgstr "高级设置"
msgid "Application"
-msgstr "应用层åè®®"
+msgstr "应用层"
msgid "Application Protocols"
msgstr "应用层åè®®"
@@ -111,15 +121,15 @@ msgid ""
"<br /><strong><a href=\"%s\">Download backup</a></strong>."
msgstr ""
"更改统计周期类型会使现有数æ®åº“无效ï¼<br /><strong><a href=\"%s\">下载备份</"
-"a></strong>."
+"a></strong>。"
msgid ""
"Choose \"Day of month\" to restart the accounting period monthly on a "
"specific date, e.g. every 3rd. Choose \"Fixed interval\" to restart the "
"accounting period exactly every N days, beginning at a given date."
msgstr ""
-"选择“æ¯æœˆçš„æŸä¸€å¤©â€æ¥è®¾ç½®ç»Ÿè®¡å‘¨æœŸçš„é‡å¯æ—¶é—´ï¼Œä¾‹å¦‚:æ¯ä¸ªæœˆçš„第 3 天。选择“固定周"
-"期â€æ¥è®¾ç½®ä»Žç»™å®šæ—¥æœŸå¼€å§‹æ¯ N 天é‡å¯ç»Ÿè®¡å‘¨æœŸã€‚"
+"选择“æ¯æœˆçš„æŸä¸€å¤©â€æ¥è®¾ç½®ç»Ÿè®¡å‘¨æœŸçš„é‡å¯æ—¶é—´ï¼Œä¾‹å¦‚:æ¯ä¸ªæœˆçš„第 3 天。选择“固定"
+"周期â€æ¥è®¾ç½®ä»Žç»™å®šæ—¥æœŸå¼€å§‹æ¯ N 天é‡å¯ç»Ÿè®¡å‘¨æœŸã€‚"
msgid "Commit interval"
msgstr "æ交间隔"
@@ -155,8 +165,8 @@ msgid ""
"towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
"24th of Februrary."
msgstr ""
-"æ¯ä¸ªæœˆé‡å¯ç»Ÿè®¡å‘¨æœŸçš„日期。使用负数表示从月底开始计算,例如:\"-5\" å¯ä»¥è¡¨"
-"示 7 月份的 27 å·æˆ–者 2 月份的 24 å·ã€‚"
+"æ¯ä¸ªæœˆé‡å¯ç»Ÿè®¡å‘¨æœŸçš„日期。使用负数表示从月底开始计算,例如:\"-5\" å¯ä»¥è¡¨ç¤º7"
+"月27å·æˆ–者2月24å·ã€‚"
msgid "Display"
msgstr "显示"
@@ -183,13 +193,13 @@ msgid "Export"
msgstr "导出"
msgid "Family"
-msgstr "å议类型"
+msgstr "å议簇"
msgid "Fixed interval"
msgstr "固定周期"
msgid "Force reload…"
-msgstr "强制é‡æ–°åŠ è½½..."
+msgstr "强制é‡æ–°åŠ è½½â€¦"
msgid "General Settings"
msgstr "基本设置"
@@ -280,8 +290,8 @@ msgid ""
"line. The first value specifies the IP protocol, the second value the port "
"number and the third column is the name of the mapped protocol."
msgstr ""
-"å议映射用于区分æµé‡ç±»åž‹ï¼Œæ¯è¡Œä¸€æ¡ã€‚第一个值指定 IP å议类型,第二个值是"
-"端å£å·ï¼Œç¬¬ä¸‰ä¸ªå€¼æ˜¯æ˜ å°„çš„åè®®å称。"
+"å议映射用于区分æµé‡ç±»åž‹ï¼Œæ¯è¡Œä¸€æ¡ã€‚第一个值指定 IP å议类型,第二个值是端å£"
+"å·ï¼Œç¬¬ä¸‰ä¸ªå€¼æ˜¯æ˜ å°„çš„åè®®å称。"
msgid "Refresh interval"
msgstr "刷新间隔"
@@ -311,8 +321,8 @@ msgid ""
"The Netlink Bandwidth Monitor (nlbwmon) is a lightweight, efficient traffic "
"accounting program keeping track of bandwidth usage per host and protocol."
msgstr ""
-"网络带宽监视器(nlbwmon)是一个轻é‡ã€é«˜æ•ˆçš„æµé‡ç»Ÿè®¡ç¨‹åºï¼Œå¯ä»¥ç»Ÿè®¡æ¯ä¸ªä¸»æœºå’Œ"
-"å议的带宽使用情况。"
+"网络带宽监视器(nlbwmon)是一个轻é‡ã€é«˜æ•ˆçš„æµé‡ç»Ÿè®¡ç¨‹åºï¼Œå¯ä»¥ç»Ÿè®¡æ¯ä¸ªä¸»æœºå’Œå"
+"议的带宽使用情况。"
msgid "The following database files have been restored: %s"
msgstr "以下数æ®åº“文件已æ¢å¤ï¼š%s"
@@ -338,7 +348,7 @@ msgid "Upload / Application"
msgstr "上传 / 应用层åè®®"
msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
-msgstr "供应商: <big id=\"bubble-vendor\">Example Corp.</big>"
+msgstr "供应商:<big id=\"bubble-vendor\">Example Corp.</big>"
msgid "Warning"
msgstr "警告"
@@ -348,7 +358,7 @@ msgid ""
"makes accessing old data slightly slower but helps to reduce storage "
"requirements."
msgstr ""
-"是å¦ä½¿ç”¨ gzip 压缩数æ®åº“存档。压缩数æ®åº“文件会使访问旧数æ®ç¨å¾®æ…¢ä¸€äº›, 但有助"
+"是å¦ä½¿ç”¨ gzip 压缩数æ®åº“存档。压缩数æ®åº“文件会使访问旧数æ®ç¨å¾®æ…¢ä¸€äº›ï¼Œä½†æœ‰åŠ©"
"于å‡å°‘存储å ç”¨ç©ºé—´ã€‚"
msgid ""
diff --git a/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
new file mode 100644
index 0000000000..e5a4b5a777
--- /dev/null
+++ b/applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
@@ -0,0 +1,376 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 19:48+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "%d IPv4-only hosts"
+msgstr "%d 臺僅 IPv4 主機"
+
+msgid "%d IPv6-only hosts"
+msgstr "%d 臺僅 IPv6 主機"
+
+msgid "%d dual-stack hosts"
+msgstr "%d 臺雙å”議棧主機"
+
+msgid "%s and %s"
+msgstr "%s 和 %s"
+
+msgid "%s, %s and %s"
+msgstr "%s,%s 和 %s"
+
+msgid "-1 - Restart every last day of month"
+msgstr "-1 - æ¯æœˆçš„最後一天é‡æ–°é–‹å§‹"
+
+msgid "-7 - Restart a week before end of month"
+msgstr "-7 - æ¯æœˆåº•å‰ä¸€é€±é‡æ–°é–‹å§‹"
+
+msgid "1 - Restart every 1st of month"
+msgstr "1 - æ¯æœˆçš„第一天é‡æ–°é–‹å§‹"
+
+msgid "10m - frequent commits at the expense of flash wear"
+msgstr "10m - é »ç¹æ交,快閃記憶體æ耗的開銷也增大"
+
+msgid "12h - compromise between risk of data loss and flash wear"
+msgstr "12h - 平衡統計資料丟失的風險以åŠå¿«é–ƒè¨˜æ†¶é«”使用壽命"
+
+msgid "24h - least flash wear at the expense of data loss risk"
+msgstr "24h - 以資料丟失風險的代價æ›å–最å°çš„快閃記憶體æ耗"
+
+msgid "30s - refresh twice per minute for reasonably current stats"
+msgstr "30s - æ¯åˆ†é˜é‡æ–°æ•´ç†äºŒæ¬¡ä»¥ç²å¾—較準確的當å‰çµ±è¨ˆå€¼"
+
+msgid "5m - rarely refresh to avoid frequently clearing conntrack counters"
+msgstr "5m - 較少é‡æ–°æ•´ç†ä»¥é¿å…é »ç¹æ¸…除連線跟蹤計數器"
+
+msgid "60s - commit minutely, useful for non-flash storage"
+msgstr "60s - æ¯åˆ†é˜æ交,é©ç”¨æ–¼éžå¿«é–ƒè¨˜æ†¶é«”型別儲存"
+
+msgid "<big id=\"conn-total\">0</big> connections"
+msgstr "連線:<big id=\"conn-total\">0</big>"
+
+msgid "<big id=\"host-total\">0</big> hosts"
+msgstr "主機:<big id=\"host-total\">0</big>"
+
+msgid "<big id=\"ipv6-hosts\">0%</big> IPv6 support rate among hosts"
+msgstr "æ”¯æ´ IPv6 的主機比例:<big id=\"ipv6-hosts\">0%</big>"
+
+msgid "<big id=\"ipv6-rx\">0B</big> total IPv6 download"
+msgstr "IPv6 總下載é‡ï¼š<big id=\"ipv6-rx\">0B</big>"
+
+msgid "<big id=\"ipv6-share\">0%</big> of the total traffic is IPv6"
+msgstr "IPv6 æµé‡æ¯”例:<big id=\"ipv6-share\">0%</big>"
+
+msgid "<big id=\"ipv6-tx\">0B</big> total IPv6 upload"
+msgstr "IPv6 總上傳é‡ï¼š<big id=\"ipv6-tx\">0B</big>"
+
+msgid "<big id=\"layer7-most-conn\">0</big> cause the most connections"
+msgstr "連線數最多的å”議:<big id=\"layer7-most-conn\">0</big>"
+
+msgid "<big id=\"layer7-most-rx\">0</big> cause the most download"
+msgstr "下載é‡æœ€å¤§çš„å”議:<big id=\"layer7-most-rx\">0</big>"
+
+msgid "<big id=\"layer7-most-tx\">0</big> cause the most upload"
+msgstr "上傳é‡æœ€å¤§çš„å”議:<big id=\"layer7-most-tx\">0</big>"
+
+msgid "<big id=\"layer7-total\">0</big> different application protocols"
+msgstr "應用層å”議計數:<big id=\"layer7-total\">0</big>"
+
+msgid "<big id=\"rx-total\">0</big> download"
+msgstr "下載:<big id=\"rx-total\">0</big>"
+
+msgid "<big id=\"tx-total\">0</big> upload"
+msgstr "上傳:<big id=\"tx-total\">0</big>"
+
+msgid "Accounting period"
+msgstr "統計週期"
+
+msgid "Advanced Settings"
+msgstr "高階設定"
+
+msgid "Application"
+msgstr "應用層"
+
+msgid "Application Protocols"
+msgstr "應用層å”è­°"
+
+msgid "Backup"
+msgstr "備份"
+
+msgid "Bandwidth Monitor"
+msgstr "頻寬監控"
+
+msgid "CSV, grouped by IP"
+msgstr "CSV,按 IP 分組"
+
+msgid "CSV, grouped by MAC"
+msgstr "CSV,按 MAC 分組"
+
+msgid "CSV, grouped by protocol"
+msgstr "CSV,按å”議分組"
+
+msgid ""
+"Changing the accounting interval type will invalidate existing databases!"
+"<br /><strong><a href=\"%s\">Download backup</a></strong>."
+msgstr ""
+"更改統計週期型別會使ç¾æœ‰è³‡æ–™åº«ç„¡æ•ˆï¼<br /><strong><a href=\"%s\">下載備份</"
+"a></strong>。"
+
+msgid ""
+"Choose \"Day of month\" to restart the accounting period monthly on a "
+"specific date, e.g. every 3rd. Choose \"Fixed interval\" to restart the "
+"accounting period exactly every N days, beginning at a given date."
+msgstr ""
+"é¸æ“‡â€œæ¯æœˆçš„æŸä¸€å¤©â€ä¾†è¨­å®šçµ±è¨ˆé€±æœŸçš„é‡å•Ÿæ™‚間,例如:æ¯å€‹æœˆçš„第 3 天。é¸æ“‡â€œå›ºå®š"
+"週期â€ä¾†è¨­å®šå¾žçµ¦å®šæ—¥æœŸé–‹å§‹æ¯ N 天é‡å•Ÿçµ±è¨ˆé€±æœŸã€‚"
+
+msgid "Commit interval"
+msgstr "æ交間隔"
+
+msgid "Compress database"
+msgstr "壓縮資料庫"
+
+msgid "Configuration"
+msgstr "é…ç½®"
+
+msgid "Conn."
+msgstr "連線"
+
+msgid "Connections"
+msgstr "連線"
+
+msgid "Connections / Host"
+msgstr "連線 / 主機"
+
+msgid "Database directory"
+msgstr "資料庫目錄"
+
+msgid ""
+"Database storage directory. One file per accounting period will be placed "
+"into this directory."
+msgstr "資料庫儲存目錄。æ¯å€‹â€œçµ±è¨ˆé€±æœŸâ€çš„檔案將被放到這個目錄中。"
+
+msgid "Day of month"
+msgstr "æ¯æœˆçš„æŸä¸€å¤©"
+
+msgid ""
+"Day of month to restart the accounting period. Use negative values to count "
+"towards the end of month, e.g. \"-5\" to specify the 27th of July or the "
+"24th of Februrary."
+msgstr ""
+"æ¯å€‹æœˆé‡å•Ÿçµ±è¨ˆé€±æœŸçš„日期。使用負數表示從月底開始計算,例如:\"-5\" å¯ä»¥è¡¨ç¤º7"
+"月27號或者2月24號。"
+
+msgid "Display"
+msgstr "顯示"
+
+msgid "Down. (Bytes / Pkts.)"
+msgstr "下載(ä½å…ƒçµ„ / 資料包)"
+
+msgid "Download (Bytes / Packets)"
+msgstr "下載(ä½å…ƒçµ„ / 資料包)"
+
+msgid "Download / Application"
+msgstr "下載 / 應用層å”è­°"
+
+msgid "Download Database Backup"
+msgstr "下載資料庫備份"
+
+msgid "Dualstack enabled hosts"
+msgstr "é›™å”議棧主機"
+
+msgid "Due date"
+msgstr "é‡ç½®æ—¥æœŸ"
+
+msgid "Export"
+msgstr "匯出"
+
+msgid "Family"
+msgstr "å”è­°ç°‡"
+
+msgid "Fixed interval"
+msgstr "固定週期"
+
+msgid "Force reload…"
+msgstr "強制é‡æ–°è¼‰å…¥â€¦"
+
+msgid "General Settings"
+msgstr "基本設定"
+
+msgid "Generate Backup"
+msgstr "生æˆå‚™ä»½"
+
+msgid "Host"
+msgstr "主機"
+
+msgid "Hostname: <big id=\"bubble-hostname\">example.org</big>"
+msgstr "主機å:<big id=\"bubble-hostname\">example.org</big>"
+
+msgid "IPv4 vs. IPv6"
+msgstr "IPv4 與 IPv6"
+
+msgid "IPv6"
+msgstr "IPv6"
+
+msgid "Interval"
+msgstr "週期"
+
+msgid ""
+"Interval at which the temporary in-memory database is committed to the "
+"persistent database directory."
+msgstr "將記憶體中的臨時資料庫æ交到永續性資料庫目錄的間隔時間。"
+
+msgid ""
+"Interval at which traffic counters of still established connections are "
+"refreshed from netlink information."
+msgstr "從 netlink 資訊中é‡æ–°æ•´ç†â€œå·²å»ºç«‹é€£ç·šâ€çš„æµé‡è¨ˆæ•¸å™¨çš„間隔時間。"
+
+msgid "Invalid or empty backup archive"
+msgstr "備份存檔無效或為空"
+
+msgid "JSON dump"
+msgstr "JSON 輸出"
+
+msgid "Length of accounting interval in days."
+msgstr "統計週期(天)。"
+
+msgid "Local interfaces"
+msgstr "本地介é¢"
+
+msgid "Local subnets"
+msgstr "本地å­ç¶²"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Maximum entries"
+msgstr "最大æ¢ç›®"
+
+msgid ""
+"Maximum number of accounting periods to keep, use zero to keep databases "
+"forever."
+msgstr "ä¿ç•™çš„統計週期數據庫的最大數é‡ï¼Œè¨­å®š 0 表示ä¸é™åˆ¶ã€‚"
+
+msgid "Netlink Bandwidth Monitor"
+msgstr "網路頻寬監視器"
+
+msgid "Netlink Bandwidth Monitor - Backup / Restore"
+msgstr "網路頻寬監視器 - 備份 / æ¢å¾©"
+
+msgid "Netlink Bandwidth Monitor - Configuration"
+msgstr "網路頻寬監視器 - é…ç½®"
+
+msgid "No data recorded yet."
+msgstr "暫無資料記錄。"
+
+msgid "Only conntrack streams from or to any of these networks are counted."
+msgstr "僅統計來自或目標為這些網路介é¢çš„連線æµé‡ã€‚"
+
+msgid "Only conntrack streams from or to any of these subnets are counted."
+msgstr "僅統計來自或目標為這些å­ç¶²çš„連線æµé‡ã€‚"
+
+msgid "Preallocate database"
+msgstr "é åˆ†é…資料庫"
+
+msgid "Protocol"
+msgstr "å”è­°"
+
+msgid "Protocol Mapping"
+msgstr "å”è­°å°æ˜ "
+
+msgid ""
+"Protocol mappings to distinguish traffic types per host, one mapping per "
+"line. The first value specifies the IP protocol, the second value the port "
+"number and the third column is the name of the mapped protocol."
+msgstr ""
+"å”è­°å°æ˜ ç”¨æ–¼å€åˆ†æµé‡åž‹åˆ¥ï¼Œæ¯è¡Œä¸€æ¢ã€‚第一個值指定 IP å”議型別,第二個值是埠"
+"號,第三個值是å°æ˜ çš„å”è­°å稱。"
+
+msgid "Refresh interval"
+msgstr "é‡æ–°æ•´ç†é–“éš”"
+
+msgid "Restore"
+msgstr "æ¢å¾©"
+
+msgid "Restore Database Backup"
+msgstr "æ¢å¾©è³‡æ–™åº«å‚™ä»½"
+
+msgid "Select accounting period:"
+msgstr "é¸æ“‡çµ±è¨ˆé€±æœŸï¼š"
+
+msgid "Source IP"
+msgstr "æº IP"
+
+msgid "Start date"
+msgstr "起始日期"
+
+msgid "Start date of the first accounting period, e.g. begin of ISP contract."
+msgstr "第一個統計週期的起始日期,例如:ISP åˆç´„的起始日期。"
+
+msgid "Stored periods"
+msgstr "儲存週期"
+
+msgid ""
+"The Netlink Bandwidth Monitor (nlbwmon) is a lightweight, efficient traffic "
+"accounting program keeping track of bandwidth usage per host and protocol."
+msgstr ""
+"網路頻寬監視器(nlbwmon)是一個輕é‡ã€é«˜æ•ˆçš„æµé‡çµ±è¨ˆç¨‹å¼ï¼Œå¯ä»¥çµ±è¨ˆæ¯å€‹ä¸»æ©Ÿå’Œå”"
+"議的頻寬使用情æ³ã€‚"
+
+msgid "The following database files have been restored: %s"
+msgstr "以下資料庫檔案已æ¢å¾©ï¼š%s"
+
+msgid ""
+"The maximum amount of entries that should be put into the database, setting "
+"the limit to 0 will allow databases to grow indefinitely."
+msgstr "資料庫中的最大æ¢ç›®æ•¸é‡, 設定為 0 å°‡å…許資料庫無é™å¢žé•·ã€‚"
+
+msgid "Traffic / Host"
+msgstr "æµé‡ / 主機"
+
+msgid "Traffic Distribution"
+msgstr "æµé‡åˆ†ä½ˆ"
+
+msgid "Up. (Bytes / Pkts.)"
+msgstr "上傳(ä½å…ƒçµ„ / 資料包)"
+
+msgid "Upload (Bytes / Packets)"
+msgstr "上傳(ä½å…ƒçµ„ / 資料包)"
+
+msgid "Upload / Application"
+msgstr "上傳 / 應用層å”è­°"
+
+msgid "Vendor: <big id=\"bubble-vendor\">Example Corp.</big>"
+msgstr "供應商:<big id=\"bubble-vendor\">Example Corp.</big>"
+
+msgid "Warning"
+msgstr "警告"
+
+msgid ""
+"Whether to gzip compress archive databases. Compressing the database files "
+"makes accessing old data slightly slower but helps to reduce storage "
+"requirements."
+msgstr ""
+"是å¦ä½¿ç”¨ gzip 壓縮資料庫存檔。壓縮資料庫檔案會使訪å•èˆŠè³‡æ–™ç¨å¾®æ…¢ä¸€äº›ï¼Œä½†æœ‰åŠ©"
+"於減少儲存佔用空間。"
+
+msgid ""
+"Whether to preallocate the maximum possible database size in memory. This is "
+"mainly useful for memory constrained systems which might not be able to "
+"satisfy memory allocation after longer uptime periods."
+msgstr ""
+"是å¦é å…ˆåˆ†é…資料庫最大å¯èƒ½ä½”用的記憶體大å°ã€‚這主è¦é©ç”¨æ–¼è¨˜æ†¶é«”較å°ç³»çµ±ï¼Œé€™äº›"
+"系統在長時間執行之後å¯èƒ½ç„¡æ³•æ»¿è¶³è³‡æ–™åº«çš„記憶體需求。"
+
+msgid "no traffic"
+msgstr "ç„¡æµé‡è³‡æ–™"
+
+msgid "other"
+msgstr "其他"
diff --git a/applications/luci-app-noddos/po/zh-cn/noddos.po b/applications/luci-app-noddos/po/zh-cn/noddos.po
new file mode 100644
index 0000000000..77e5423b90
--- /dev/null
+++ b/applications/luci-app-noddos/po/zh-cn/noddos.po
@@ -0,0 +1,105 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 19:57+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Class"
+msgstr "ç±»"
+
+msgid "Client Firewall"
+msgstr "客户端防ç«å¢™"
+
+msgid "Clients"
+msgstr "客户端"
+
+msgid "DhcpHostname"
+msgstr "DhcpHostname"
+
+msgid "DhcpVendor"
+msgstr "DhcpVendor"
+
+msgid "Don't monitor these IPv4 addresses"
+msgstr "ä¸è¦ç›‘视这些 IPv4 地å€"
+
+msgid "Don't monitor these IPv6 addresses"
+msgstr "ä¸è¦ç›‘视这些 IPv6 地å€"
+
+msgid "Don't monitor these MAC addresses"
+msgstr "ä¸è¦ç›‘视这些 MAC 地å€"
+
+msgid "Excluded IPv4 addresses"
+msgstr "排除的 IPv4 地å€"
+
+msgid "Excluded IPv6 addresses"
+msgstr "排除的 IPv6 地å€"
+
+msgid "Excluded MAC addresses"
+msgstr "排除的 MAC 地å€"
+
+msgid "Hostname"
+msgstr "主机å"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Manufacturer"
+msgstr "制造商"
+
+msgid "Model"
+msgstr "模型"
+
+msgid "Noddos Client Tracking"
+msgstr "Noddos 客户端跟踪"
+
+msgid "Noddos Clients"
+msgstr "Noddos 客户端"
+
+msgid ""
+"Noddos controls traffic from the clients on your network to the Internet. "
+"This helps protect your network, the bandwidth on your Internet connection "
+"and the Internet"
+msgstr ""
+"Noddos 控制您网络上的客户端到互è”网的æµé‡ã€‚这有助于ä¿æŠ¤æ‚¨çš„网络ã€æ‚¨çš„互è”网连"
+"接以åŠäº’è”网"
+
+msgid "Private networks"
+msgstr "ç§äººç½‘络"
+
+msgid "Recognized Clients"
+msgstr "认å¯çš„客户"
+
+msgid ""
+"Report traffic to private networks (10/8, 172.16/12, 192.168/16, "
+"fd75:6b5d:352c:ed05::/64)"
+msgstr ""
+"报告专用网络æµé‡ï¼ˆ10/8,172.16/12,192.168/16,fd75:6b5d:352c:ed05::/64)"
+
+msgid "Server Settings"
+msgstr "æœåŠ¡å™¨è®¾ç½®"
+
+msgid ""
+"The following clients have been discovered on the network. The last "
+"discovery was completed at"
+msgstr "已在网络上å‘现以下客户端。最åŽå‘现于"
+
+msgid "Unrecognized Clients"
+msgstr "无法识别的客户端"
+
+msgid "Upload anonimized traffic stats"
+msgstr "上传匿åæµé‡ç»Ÿè®¡ä¿¡æ¯"
+
+msgid ""
+"Uploading your statistics helps improving device recognition and discovering "
+"hacked devices & botnets"
+msgstr "上传统计信æ¯æœ‰åŠ©äºŽæ高设备识别率,并å‘现被黑客入侵的设备åŠåƒµå°¸ç½‘络"
diff --git a/applications/luci-app-noddos/po/zh-tw/noddos.po b/applications/luci-app-noddos/po/zh-tw/noddos.po
new file mode 100644
index 0000000000..ee10c1f9ad
--- /dev/null
+++ b/applications/luci-app-noddos/po/zh-tw/noddos.po
@@ -0,0 +1,105 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 19:57+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "Class"
+msgstr "é¡ž"
+
+msgid "Client Firewall"
+msgstr "客戶端防ç«ç‰†"
+
+msgid "Clients"
+msgstr "客戶端"
+
+msgid "DhcpHostname"
+msgstr "DhcpHostname"
+
+msgid "DhcpVendor"
+msgstr "DhcpVendor"
+
+msgid "Don't monitor these IPv4 addresses"
+msgstr "ä¸è¦ç›£è¦–這些 IPv4 ä½å€"
+
+msgid "Don't monitor these IPv6 addresses"
+msgstr "ä¸è¦ç›£è¦–這些 IPv6 ä½å€"
+
+msgid "Don't monitor these MAC addresses"
+msgstr "ä¸è¦ç›£è¦–這些 MAC ä½å€"
+
+msgid "Excluded IPv4 addresses"
+msgstr "排除的 IPv4 ä½å€"
+
+msgid "Excluded IPv6 addresses"
+msgstr "排除的 IPv6 ä½å€"
+
+msgid "Excluded MAC addresses"
+msgstr "排除的 MAC ä½å€"
+
+msgid "Hostname"
+msgstr "主機å"
+
+msgid "IPv4"
+msgstr "IPv4"
+
+msgid "MAC"
+msgstr "MAC"
+
+msgid "Manufacturer"
+msgstr "製造商"
+
+msgid "Model"
+msgstr "模型"
+
+msgid "Noddos Client Tracking"
+msgstr "Noddos 客戶端跟蹤"
+
+msgid "Noddos Clients"
+msgstr "Noddos 客戶端"
+
+msgid ""
+"Noddos controls traffic from the clients on your network to the Internet. "
+"This helps protect your network, the bandwidth on your Internet connection "
+"and the Internet"
+msgstr ""
+"Noddos 控制您網路上的客戶端到網際網路的æµé‡ã€‚這有助於ä¿è­·æ‚¨çš„網路ã€æ‚¨çš„網際網"
+"路連接以åŠç¶²éš›ç¶²è·¯"
+
+msgid "Private networks"
+msgstr "ç§äººç¶²è·¯"
+
+msgid "Recognized Clients"
+msgstr "èªå¯çš„客戶"
+
+msgid ""
+"Report traffic to private networks (10/8, 172.16/12, 192.168/16, "
+"fd75:6b5d:352c:ed05::/64)"
+msgstr ""
+"報告專用網路æµé‡ï¼ˆ10/8,172.16/12,192.168/16,fd75:6b5d:352c:ed05::/64)"
+
+msgid "Server Settings"
+msgstr "伺æœå™¨è¨­å®š"
+
+msgid ""
+"The following clients have been discovered on the network. The last "
+"discovery was completed at"
+msgstr "已在網路上發ç¾ä»¥ä¸‹å®¢æˆ¶ç«¯ã€‚最後發ç¾æ–¼"
+
+msgid "Unrecognized Clients"
+msgstr "無法識別的客戶端"
+
+msgid "Upload anonimized traffic stats"
+msgstr "上傳匿åæµé‡çµ±è¨ˆè³‡è¨Š"
+
+msgid ""
+"Uploading your statistics helps improving device recognition and discovering "
+"hacked devices & botnets"
+msgstr "上傳統計資訊有助於æ高è£ç½®è­˜åˆ¥çŽ‡ï¼Œä¸¦ç™¼ç¾è¢«é§­å®¢å…¥ä¾µçš„è£ç½®åŠæ®­å±ç¶²è·¯"
diff --git a/applications/luci-app-ntpc/po/zh-cn/ntpc.po b/applications/luci-app-ntpc/po/zh-cn/ntpc.po
index 0821c3f46f..bb612f0a13 100644
--- a/applications/luci-app-ntpc/po/zh-cn/ntpc.po
+++ b/applications/luci-app-ntpc/po/zh-cn/ntpc.po
@@ -1,17 +1,20 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: LuCi Chinese Translation\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-14 13:24+0200\n"
-"PO-Revision-Date: 2012-11-15 21:39+0200\n"
-"Last-Translator: Rui <shenrui01@gmail.com>\n"
-"Language-Team: QQ Group 75543259\n"
+"PO-Revision-Date: 2018-08-07 19:58+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Clock Adjustment"
msgstr "时钟校对"
@@ -47,7 +50,7 @@ msgid "Time Synchronisation"
msgstr "时间åŒæ­¥"
msgid "Update interval (in seconds)"
-msgstr "更新间隔(秒)"
+msgstr "更新间隔(秒)"
msgid "empty = infinite"
-msgstr "空值为无é™é•¿åº¦"
+msgstr "空值=ä¸é™åˆ¶"
diff --git a/applications/luci-app-ntpc/po/zh-tw/ntpc.po b/applications/luci-app-ntpc/po/zh-tw/ntpc.po
index a898671136..083e6461f7 100644
--- a/applications/luci-app-ntpc/po/zh-tw/ntpc.po
+++ b/applications/luci-app-ntpc/po/zh-tw/ntpc.po
@@ -1,15 +1,18 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-14 18:43+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 19:58+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Clock Adjustment"
msgstr "校時修正"
@@ -33,7 +36,7 @@ msgid "Port"
msgstr "埠號"
msgid "Synchronizes the system time"
-msgstr "åŒæ­¥é€™å€‹ç³»çµ±æ™‚é–“"
+msgstr "åŒæ­¥ç³»çµ±æ™‚é–“"
msgid "Time Server"
msgstr "校時伺æœå™¨"
@@ -45,7 +48,7 @@ msgid "Time Synchronisation"
msgstr "校時åŒæ­¥"
msgid "Update interval (in seconds)"
-msgstr "更新間隔(秒)"
+msgstr "更新間隔(秒)"
msgid "empty = infinite"
msgstr "留白=ä¸é™åˆ¶"
diff --git a/applications/luci-app-nut/Makefile b/applications/luci-app-nut/Makefile
new file mode 100644
index 0000000000..b5c5b0d4c3
--- /dev/null
+++ b/applications/luci-app-nut/Makefile
@@ -0,0 +1,16 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+LUCI_TITLE:=Network UPS Tools Configuration
+LUCI_PKGARCH:=all
+PKG_RELEASE:=1
+
+include ../../luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-nut/luasrc/controller/nut.lua b/applications/luci-app-nut/luasrc/controller/nut.lua
new file mode 100644
index 0000000000..5598451d6e
--- /dev/null
+++ b/applications/luci-app-nut/luasrc/controller/nut.lua
@@ -0,0 +1,25 @@
+-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
+-- Licensed to the public under the Apache License 2.0.
+
+module("luci.controller.nut", package.seeall)
+
+function index()
+ if not nixio.fs.access("/etc/config/nut_server") and not nixio.fs.access("/etc/config/nut_monitor") and not nixio.fs.access("/etc/config/nut_cgi") then
+ return
+ end
+
+ entry({"admin", "services", "nut"}, firstchild(), _("Network UPS Tools"))
+
+ if nixio.fs.access("/etc/config/nut_server") then
+ entry({"admin", "services", "nut", "server"}, cbi("nut_server"), _("Network UPS Tools (Server)"), 20)
+ end
+
+ if nixio.fs.access("/etc/config/nut_monitor") then
+ entry({"admin", "services", "nut", "monitor"}, cbi("nut_monitor"), _("Network UPS Tools (Monitor)"), 30)
+ end
+
+ if nixio.fs.access("/etc/config/nut_cgi") then
+ entry({"admin", "services", "nut", "cgi"}, cbi("nut_cgi"), _("Network UPS Tools (CGI)"), 40)
+ end
+end
+
diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua
new file mode 100644
index 0000000000..9afa2ed24e
--- /dev/null
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_cgi.lua
@@ -0,0 +1,44 @@
+-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
+-- Licensed to the public under the Apache License 2.0.
+
+local m, s, o
+
+m = Map("nut_cgi", translate("Network UPS Tools (CGI)"),
+ translate("Network UPS Tools CGI Configuration"))
+
+s = m:section(SimpleSection, translate("NUT CGI Access"))
+s.addremove = false
+s.anonymous = true
+
+o = s:option(DummyValue, "nut_cgi_go", '<a href="/nut">' .. translate("Go to NUT CGI") .. '</a>')
+o.section = "cbi-nut_cgi"
+
+s = m:section(TypedSection, "host", translate("Host"))
+s.addremove = true
+s.anonymous = true
+
+o = s:option(Value, "upsname", translate("UPS name"), translate("As configured by NUT"))
+o.optional = false
+
+o = s:option(Value, "hostname", translate("Hostname or IP address"))
+o.optional = false
+o.datatype = "host"
+
+o = s:option(Value, "port", translate("Port"))
+o.datatype = "port"
+o.optional = true
+o.placeholder = 3493
+
+o = s:option(Value, "displayname", translate("Display name"))
+o.optional = false
+
+s = m:section(TypedSection, "upsset", translate("Control UPS via CGI"))
+s.addremove = false
+s.anonymous = true
+s.optional = false
+
+o = s:option(Flag, "enable", translate("Enable"))
+o.optional = false
+o.default = false
+
+return m
diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua
new file mode 100644
index 0000000000..0eda5d83e0
--- /dev/null
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_monitor.lua
@@ -0,0 +1,241 @@
+-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
+-- Licensed to the public under the Apache License 2.0.
+
+local m, s, o
+require "luci.util"
+
+m = Map("nut_monitor", translate("Network UPS Tools (Monitor)"),
+ translate("Network UPS Tools Monitoring Configuration"))
+
+s = m:section(NamedSection, "upsmon", "upsmon", translate("Global Settings"))
+s.addremove = true
+s.optional = true
+
+o = s:option(Value, "runas", translate("RunAs User"), translate("upsmon drops privileges to this user"))
+o.placeholder = "nutmon"
+
+o = s:option(Value, "minsupplies", translate("Minimum required number or power supplies"))
+o.datatype = "uinteger"
+o.placeholder = 1
+o.optional = true
+
+o = s:option(Value, "shutdowncmd", translate("Shutdown command"))
+o.optional = true
+o.placeholder = "/sbin/halt"
+
+o = s:option(Value, "notifycmd", translate("Notify command"))
+o.optional = true
+
+o = s:option(Value, "pollfreq", translate("Poll frequency"))
+o.datatype = "uinteger"
+o.placeholder = 5
+o.optional = true
+
+o = s:option(Value, "pollfreqalert", translate("Poll frequency alert"))
+o.datatype = "uinteger"
+o.optional = true
+o.placeholder = 5
+
+o = s:option(Value, "hotsync", translate("Hot Sync"))
+o.optional = true
+o.placeholder = 15
+
+o = s:option(Value, "deadtime", translate("Deadtime"))
+o.datatype = "uinteger"
+o.optional = true
+o.placeholder = 15
+
+o = s:option(Value, "onlinemsg", translate("Online message"))
+o.optional = true
+
+o = s:option(Value, "onbattmsg", translate("On battery message"))
+o.optional = true
+
+o = s:option(Value, "lowbattmsg", translate("Low battery message"))
+o.optional = true
+
+o = s:option(Value, "fsdmsg", translate("Forced shutdown message"))
+o.optional = true
+
+o = s:option(Value, "comokmsg", translate("Communications restored message"))
+o.optional = true
+
+o = s:option(Value, "combadmsg", translate("Communications lost message"))
+o.optional = true
+
+o = s:option(Value, "shutdownmsg", translate("Shutdown message"))
+o.optional = true
+
+o = s:option(Value, "replbattmsg", translate("Replace battery message"))
+o.optional = true
+
+o = s:option(Value, "nocommsg", translate("No communications message"))
+o.optional = true
+
+o = s:option(Value, "noparentmsg", translate("No parent message"))
+o.optional = true
+
+validatenotify = function(self, value)
+ val = StaticList.validate(self, value)
+ if val then
+ for k, v in pairs(val) do
+ if (v == 'IGNORE') then
+ return nil, "Ignore must the only option selected, when selected"
+ end
+ end
+ end
+ return val
+end
+
+o = s:option(StaticList, "defaultnotify", translate("Notification defaults"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.default = "SYSLOG"
+o.validate = validatenotify
+
+o = s:option(StaticList, "onlinenotify", translate("Notify when back online"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "onbattnotify", translate("Notify when on battery"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "nowbattnotify", translate("Notify when low battery"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "nowbattnotify", translate("Notify when low battery"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "fsdnotify", translate("Notify when force shutdown"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "comoknotify", translate("Notify when communications restored"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "combadnotify", translate("Notify when communications lost"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "shutdownotify", translate("Notify when shutting down"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+o = s:option(StaticList, "replbattnotify", translate("Notify when battery needs replacing"))
+o.optional = true
+o.widget = "select"
+o:value("EXEC", translate("Execute notify command"))
+o:value("SYSLOG", translate("Write to syslog"))
+o:value("IGNORE", translate("Ignore"))
+o.validate = validatenotify
+
+local have_ssl_support = luci.util.checklib("/usr/sbin/upsmon", "libssl.so")
+
+if have_ssl_support then
+ o = s:option(Value, "certpath", translate("CA Certificate path"), translate("Path containing ca certificates to match against host certificate"))
+ o.optional = true
+ o.placeholder = "/etc/ssl/certs"
+
+ o = s:option(Flag, "certverify", translate("Verify all connection with SSL"), translate("Require SSL and make sure server CN matches hostname"))
+ o.optional = true
+ o.default = false
+end
+
+s = m:section(TypedSection, "master", translate("UPS Master"))
+s.optional = true
+s.addremove = true
+s.anonymous = true
+
+o = s:option(Value, "upsname", translate("Name of UPS"), translate("As configured by NUT"))
+o.optional = false
+
+o = s:option(Value, "hostname", translate("Hostname or address of UPS"))
+o.optional = false
+s.datetype = "host"
+
+o = s:option(Value, "port", translate("Port"))
+o.optional = true
+o.placeholder = 3493
+o.datatype = "port"
+
+o = s:option(Value, "powervalue", translate("Power value"))
+o.optional = false
+o.datatype = "uinteger"
+o.default = 1
+
+o = s:option(Value, "username", translate("Username"))
+o.optional = false
+
+o = s:option(Value, "password", translate("Password"))
+o.optional = false
+o.password = true
+
+s = m:section(TypedSection, "slave", translate("UPS Slave"))
+s.optional = true
+s.addremove = true
+s.anonymous = true
+
+o = s:option(Value, "upsname", translate("Name of UPS"), translate("As configured by NUT"))
+o.optional = false
+
+o = s:option(Value, "hostname", translate("Hostname or address of UPS"))
+o.optional = false
+s.datetype = "host"
+
+o = s:option(Value, "port", translate("Port"))
+o.optional = true
+o.placeholder = 3493
+o.datatype = "port"
+
+o = s:option(Value, "powervalue", translate("Power value"))
+o.optional = false
+o.datatype = "uinteger"
+o.default = 1
+
+o = s:option(Value, "username", translate("Username"))
+o.optional = false
+
+o = s:option(Value, "password", translate("Password"))
+o.optional = false
+o.password = true
+
+return m
diff --git a/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
new file mode 100644
index 0000000000..dea7932395
--- /dev/null
+++ b/applications/luci-app-nut/luasrc/model/cbi/nut_server.lua
@@ -0,0 +1,191 @@
+-- Copyright 2015 Daniel Dickinson <openwrt@daniel.thecshore.com>
+-- Licensed to the public under the Apache License 2.0.
+
+local m, s, o
+
+local nixio = require "nixio"
+require "luci.util"
+
+m = Map("nut_server", translate("Network UPS Tools (Server)"),
+ translate("Network UPS Tools Server Configuration"))
+
+s = m:section(TypedSection, "user", translate("NUT Users"))
+s.addremove = true
+s.anonymous = true
+
+o = s:option(Value, "username", translate("Username"))
+o.optional = false
+
+o = s:option(Value, "password", translate("Password"))
+o.password = true
+o.optional = false
+
+o = s:option(MultiValue, "actions", translate("Allowed actions"))
+o.widget = "select"
+o:value("set", translate("Set variables"))
+o:value("fsd", translate("Forced Shutdown"))
+o.optional = true
+
+o = s:option(DynamicList, "instcmd", translate("Instant commands"), translate("Use upscmd -l to see full list which the commands your UPS supports (requires upscmd package)"))
+o.optional = true
+
+o = s:option(ListValue, "upsmon", translate("Role"))
+o:value("slave", translate("Slave"))
+o:value("master", translate("Master"))
+o.optional = false
+
+s = m:section(TypedSection, "listen_address", translate("Addresses on which to listen"))
+s.addremove = true
+s.anonymous = true
+
+o = s:option(Value, "address", translate("IP Address"))
+o.optional = false
+o.datatype = "ipaddr"
+o.placeholder = "127.0.0.1"
+
+o = s:option(Value, "port", translate("Port"))
+o.optional = true
+o.datatype = "port"
+o.placeholder = "3493"
+
+s = m:section(NamedSection, "upsd", "upsd", translate("Global Settings"))
+s.addremove = true
+
+o = s:option(Value, "maxage", translate("Maximum Age of Data"), translate("Period after which data is considered stale"))
+o.datatype = "uinteger"
+o.optional = true
+o.placeholder = 15
+
+o = s:option(Value, "runas", translate("RunAs User"), translate("Drop privileges to this user"))
+o.optional = true
+o.placeholder = "nut"
+
+o = s:option(Value, "statepath", translate("Path to state file"))
+o.optional = true
+o.placeholder = "/var/run/nut"
+
+o = s:option(Value, "maxconn", translate("Maximum connections"))
+o.optional = true
+o.datatype = "uinteger"
+o.placeholder = 24
+
+if luci.util.checklib("/usr/sbin/upsd", "libssl.so") then
+ o = s:option(Value, "certfile", translate("Certificate file (SSL)"))
+ o.optional = true
+end
+
+s = m:section(TypedSection, "driver", translate("Driver Configuration"),
+ translate("The name of this section will be used as UPS name elsewhere"))
+s.addremove = true
+s.anonymous = false
+
+driverlist = nixio.fs.dir("/lib/nut")
+
+o = s:option(ListValue, "driver", translate("Driver"))
+for driver in driverlist do
+ o:value(driver)
+end
+o.optional = false
+
+o = s:option(Value, "port", translate("Port"))
+o.optional = false
+o.default = "auto"
+
+o = s:option(Value, "mfr", translate("Manufacturer (Display)"))
+o.optional = true
+
+o = s:option(Value, "model", translate("Model (Display)"))
+o.optional = true
+
+o = s:option(Value, "serial", translate("Serial Number"))
+o.optional = true
+
+o = s:option(Value, "sdtime", translate("Additional Shutdown Time(s)"))
+o.optional = true
+
+o = s:option(Value, "offdelay", translate("Off Delay(s)"), translate("Delay for kill power command"))
+o.optional = true
+o.placeholder = 20
+
+n = s:option(Value, "ondelay", translate("On Delay(s)"), translate("Delay to power on UPS if power returns after kill power"))
+n.optional = true
+n.placeholder = 30
+
+function o.validate(self, cfg, value)
+ if n:cfgvalue(cfg) <= value then
+ return nil
+ end
+end
+
+function n.validate(self, cfg, value)
+ if o:cfgvalue(cfg) >= value then
+ return nil
+ end
+end
+
+o = s:option(Value, "pollfreq", translate("Polling Frequency(s)"))
+o.optional = true
+o.datatype = "integer"
+o.placeholder = 30
+
+o = s:option(Value, "vendor", translate("Vendor (regex)"))
+o.optional = true
+
+o = s:option(Value, "product", translate("Product (regex)"))
+o.optional = true
+
+o = s:option(Value, "bus", translate("USB Bus(es) (regex)"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Flag, "interruptonly", translate("Interrupt Only"))
+o.optional = true
+o.default = false
+
+o = s:option(Value, "interruptsize", translate("Interrupt Size"), translate("Bytes to read from interrupt pipe"))
+o.optional = true
+o.datatype = "integer"
+
+o = s:option(Value, "maxreport", translate("Max USB HID Length Reported"), translate("Workaround for buggy firmware"))
+o.optional = true
+o.datatype = "integer"
+o.default = nil
+
+o = s:option(Value, "vendorid", translate("USB Vendor Id"))
+o.optional = true
+
+o = s:option(Value, "productid", translate("USB Product Id"))
+o.optional = true
+
+o = s:option(Value, "runas", translate("RunAs User"), translate("User as which to execute driver; requires device file accessed by driver be read-write for that user."))
+o.optional = true
+o.placeholder = "nut"
+
+o = s:option(Value, "community", translate("SNMP Community"))
+o.optional = true
+o.placeholder = "private"
+
+o = s:option(ListValue, "snmp_version", translate("SNMP version"))
+o.optional = true
+o:value("v1", translate("SNMPv1"))
+o:value("v2c", translate("SNMPv2c"))
+o:value("v3", translate("SNMPv3"))
+o:value("", "")
+o.default = ""
+
+o = s:option(Value, "snmp_retries", translate("SNMP retries"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Value, "snmp_timeout", translate("SNMP timeout(s)"))
+o.optional = true
+o.datatype = "uinteger"
+
+o = s:option(Flag, "notransferoids", translate("No low/high voltage transfer OIDs"))
+o.optional = true
+o.default = false
+
+o = s:option(Value, "other", translate("Additional Parameters"))
+o.optional = true
+
+return m
diff --git a/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut b/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut
new file mode 100755
index 0000000000..621f6a6a38
--- /dev/null
+++ b/applications/luci-app-nut/root/etc/uci-defaults/40_luci-nut
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+version="$(opkg status nut|grep 'Version: '|cut -f2 -d\ )"
+release="$(echo $version|cut -f2 -d-)"
+
+if [ "$version" = "2.7.4" ] && [ "$release" -lt 8 ]; then
+ uci -q batch <<-EOF >/dev/null
+ delete ucitrack.@nut_server[-1]
+ delete ucitrack.@nut_monitor[-1]
+ delete ucitrack.@nut_cgi[-1]
+ add ucitrack nut_server
+ set ucitrack.@nut_server[-1].init=nut-server
+ add ucitrack nut_monitor
+ set ucitrack.@nut_monitor[-1].init=nut-monitor
+ add ucitrack nut_cgi
+ set ucitrack.@nut_cgi[-1].init=nut-cgi
+ commit ucitrack
+EOF
+fi
+
+rm -f /tmp/luci-indexcache
+exit 0
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
index dc7718217c..6dc43bec24 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua
@@ -204,10 +204,6 @@ local knownParams = {
"dev_node",
"/dev/net/tun",
translate("Use tun/tap device node") },
- { Flag,
- "tun_ipv6",
- 0,
- translate("Make tun device IPv6 capable") },
{ Value,
"ifconfig",
"10.200.200.3 10.200.200.1",
@@ -248,15 +244,6 @@ local knownParams = {
"mtu_test",
0,
translate("Empirically measure MTU") },
- { ListValue,
- "comp_lzo",
- { "yes", "no", "adaptive" },
- translate("Use fast LZO compression") },
- { Flag,
- "comp_noadapt",
- 0,
- translate("Don't use adaptive lzo compression"),
- { comp_lzo=1 } },
{ Value,
"link_mtu",
1500,
@@ -375,7 +362,7 @@ local knownParams = {
{ client="0" }, { client="" } },
{ DynamicList,
"push",
- { "redirect-gateway", "comp-lzo" },
+ { "redirect-gateway" },
translate("Push options to peer"),
{ client="0" }, { client="" } },
{ Flag,
@@ -398,12 +385,6 @@ local knownParams = {
"/etc/openvpn/ipp.txt 600",
translate("Persist/unpersist ifconfig-pool"),
{ client="0" }, { client="" } },
- -- deprecated and replaced by --topology p2p
- -- { Flag,
- -- "ifconfig_pool_linear",
- -- 0,
- -- translate("Use individual addresses rather than /30 subnets"),
- -- { client="0" }, { client="" } },
{ Value,
"ifconfig_push",
"10.200.200.1 255.255.255.255",
@@ -470,11 +451,6 @@ local knownParams = {
translate("Allowed maximum of new connections"),
{ client="0" }, { client="" } },
{ Flag,
- "client_cert_not_required",
- 0,
- translate("Don't require client certificate"),
- { client="0" }, { client="" } },
- { Flag,
"username_as_common_name",
0,
translate("Use username as common name"),
@@ -591,10 +567,6 @@ local knownParams = {
"engine",
"dynamic",
translate("Enable OpenSSL hardware crypto engines") },
- { Flag,
- "no_replay",
- 0,
- translate("Disable replay protection") },
{ Value,
"replay_window",
"64 15",
@@ -608,10 +580,6 @@ local knownParams = {
"/var/run/openvpn-replay-state",
translate("Persist replay-protection state") },
{ Flag,
- "no_iv",
- 0,
- translate("Disable cipher initialisation vector") },
- { Flag,
"tls_server",
0,
translate("Enable TLS and assume server role"),
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
index 3f651c0ada..483860c8e9 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn-basic.lua
@@ -4,7 +4,6 @@
require("luci.ip")
require("luci.model.uci")
-
local basicParams = {
--
-- Widget, Name, Default(s), Description
@@ -14,14 +13,12 @@ local basicParams = {
{ Value, "nice",0, translate("Change process priority") },
{ Value,"port",1194, translate("TCP/UDP port # for both local and remote") },
{ ListValue,"dev_type",{ "tun", "tap" }, translate("Type of used device") },
- { Flag,"tun_ipv6",0, translate("Make tun device IPv6 capable") },
{ Value,"ifconfig","10.200.200.3 10.200.200.1", translate("Set tun/tap adapter parameters") },
{ Value,"server","10.200.200.0 255.255.255.0", translate("Configure server mode") },
{ Value,"server_bridge","192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254", translate("Configure server bridge") },
{ Flag,"nobind",0, translate("Do not bind to local address and port") },
- { ListValue,"comp_lzo",{"yes","no","adaptive"}, translate("Use fast LZO compression") },
{ Value,"keepalive","10 60", translate("Helper directive to simplify the expression of --ping and --ping-restart in server mode configurations") },
{ ListValue,"proto",{ "udp", "tcp-client", "tcp-server" }, translate("Use protocol") },
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
index a6b0e1dd90..e17aa4085b 100644
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
@@ -52,21 +52,22 @@ function s.create(self, name)
luci.cbi.CREATE_PREFIX .. self.config .. "." ..
self.sectiontype .. ".select"
)
- name = luci.http.formvalue(
+ local name = luci.http.formvalue(
luci.cbi.CREATE_PREFIX .. self.config .. "." ..
self.sectiontype .. ".text"
)
if #name > 3 and not name:match("[^a-zA-Z0-9_]") then
- uci:section(
- "openvpn", "openvpn", name,
- uci:get_all( "openvpn_recipes", recipe )
- )
-
- uci:delete("openvpn", name, "_role")
- uci:delete("openvpn", name, "_description")
- uci:save("openvpn")
-
- luci.http.redirect( self.extedit:format(name) )
+ local s = uci:section("openvpn", "openvpn", name)
+ if s then
+ local options = uci:get_all("openvpn_recipes", recipe)
+ for k, v in pairs(options) do
+ uci:set("openvpn", name, k, v)
+ end
+ uci:delete("openvpn", name, "_role")
+ uci:delete("openvpn", name, "_description")
+ uci:save("openvpn")
+ luci.http.redirect( self.extedit:format(name) )
+ end
elseif #name > 0 then
self.invalid_cts = true
end
diff --git a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
index f22cb68c7b..8cb019b461 100644
--- a/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
+++ b/applications/luci-app-openvpn/luasrc/view/openvpn/pageswitch.htm
@@ -4,11 +4,11 @@
Licensed to the public under the Apache License 2.0.
-%>
-<fieldset class="cbi-section">
- <legend>
+<div class="cbi-section">
+ <h3>
<a href="<%=url('admin/services/openvpn')%>"><%:Overview%></a> &raquo;
<%=luci.i18n.translatef("Instance \"%s\"", self.instance)%>
- </legend>
+ </h3>
<% if self.mode == "basic" then %>
<a href="<%=url('admin/services/openvpn/advanced', self.instance, "Service")%>"><%:Switch to advanced configuration »%></a>
@@ -27,4 +27,4 @@
<% if next(self.categories, i) then %>|<% end %>
<% end %>
<% end %>
-</fieldset>
+</div>
diff --git a/applications/luci-app-openvpn/po/zh-tw/openvpn.po b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
index 38bb6fcd0e..f98d24c6c1 100644
--- a/applications/luci-app-openvpn/po/zh-tw/openvpn.po
+++ b/applications/luci-app-openvpn/po/zh-tw/openvpn.po
@@ -1,12 +1,12 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-19 19:35+0200\n"
-"PO-Revision-Date: 2017-10-29 14:37+0800\n"
+"PO-Revision-Date: 2018-08-07 17:36+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_TW\n"
@@ -68,7 +68,7 @@ msgid "Below is a list of configured OpenVPN instances and their current state"
msgstr "以下是 OpenVPN å·²é…置例項åŠå…¶ç•¶å‰ç‹€æ…‹çš„列表"
msgid "Call down cmd/script before TUN/TAP close"
-msgstr "TUN/TAP 關閉å‰çš„命令列åŠæŒ‡ä»¤ç¢¼"
+msgstr "TUN/TAP 關閉å‰çš„指令列åŠæŒ‡ä»¤ç¢¼"
msgid "Certificate authority"
msgstr "èªè­‰æŽˆæ¬Š"
@@ -122,7 +122,7 @@ msgid "Diffie Hellman parameters"
msgstr "Diffie–Hellman/DH 金鑰交æ›å¼•æ•¸"
msgid "Directory for custom client config files"
-msgstr "自定義客戶端é…置檔案的目錄"
+msgstr "自訂客戶端é…置檔案的目錄"
msgid "Disable Paging"
msgstr "ç¦æ­¢åˆ†é "
@@ -140,7 +140,7 @@ msgid "Do not bind to local address and port"
msgstr "ä¸ç¹«çµæœ¬åœ°ä½å€å’ŒåŸ "
msgid "Don't actually execute ifconfig"
-msgstr "ä¸å¯¦éš›åŸ·è¡Œ ifconfig 命令"
+msgstr "ä¸å¯¦éš›åŸ·è¡Œ ifconfig 指令"
msgid "Don't add routes automatically"
msgstr "ä¸è‡ªå‹•æ–°å¢žè·¯ç”±"
@@ -206,10 +206,10 @@ msgid "Encryption cipher for packets"
msgstr "加密資料包"
msgid "Execute shell cmd after routes are added"
-msgstr "新增路由後執行 shell 命令"
+msgstr "新增路由後執行 shell 指令"
msgid "Execute shell command on remote ip change"
-msgstr "當é ç«¯ ip 改變時執行 shell 命令"
+msgstr "當é ç«¯ ip 改變時執行 shell 指令"
msgid ""
"Executed in server mode on new client connections, when the client is still "
@@ -348,7 +348,7 @@ msgid "Randomly choose remote server"
msgstr "隨機é¸æ“‡é ç«¯ä¼ºæœå™¨"
msgid "Refuse connection if no custom client config"
-msgstr "拒接沒有自定義客戶端é…置的連線"
+msgstr "拒接沒有自訂客戶端é…置的連線"
msgid "Remap SIGUSR1 signals"
msgstr "é‡å°æ˜  SIGUSR1 訊號"
@@ -396,10 +396,10 @@ msgid "Run as an inetd or xinetd server"
msgstr "以 inetd 或 xinetd 伺æœå™¨çš„æ–¹å¼åŸ·è¡Œ"
msgid "Run script cmd on client connection"
-msgstr "當客戶端連線時在命令列下å…許指令碼"
+msgstr "當客戶端連線時在指令列下å…許指令碼"
msgid "Run script cmd on client disconnection"
-msgstr "當客戶端斷開時在命令列下å…許指令碼"
+msgstr "當客戶端斷開時在指令列下å…許指令碼"
msgid "Run up/down scripts for all restarts"
msgstr "æ¯æ¬¡é‡å•Ÿéƒ½åŸ·è¡Œå•Ÿå‹•/關閉指令碼"
@@ -453,13 +453,13 @@ msgid "Shaping for peer bandwidth"
msgstr "改變çµé»žé »å¯¬"
msgid "Shell cmd to execute after tun device open"
-msgstr "tun è£ç½®é–‹å•Ÿå¾ŒåŸ·è¡Œçš„ shell 命令"
+msgstr "tun è£ç½®é–‹å•Ÿå¾ŒåŸ·è¡Œçš„ shell 指令"
msgid "Shell cmd to run after tun device close"
-msgstr "tun è£ç½®é—œé–‰å¾ŒåŸ·è¡Œçš„ shell 命令"
+msgstr "tun è£ç½®é—œé–‰å¾ŒåŸ·è¡Œçš„ shell 指令"
msgid "Shell command to verify X509 name"
-msgstr "執行 shell 命令以驗證 X509 å稱"
+msgstr "執行 shell 指令以驗證 X509 å稱"
msgid "Silence the output of replay warnings"
msgstr "以éœéŸ³çš„æ–¹å¼ç™¼å‡ºé‡æ’­è­¦å‘Š"
diff --git a/applications/luci-app-openvpn/root/etc/config/openvpn_recipes b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
index 1b394dffbc..69270e48e1 100644
--- a/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
+++ b/applications/luci-app-openvpn/root/etc/config/openvpn_recipes
@@ -2,101 +2,94 @@
# Routed point-to-point server
#
config openvpn_recipe server_tun_ptp
- option _description "Simple server configuration for a routed point-to-point VPN"
- option _role "server"
- option dev "tun"
- option ifconfig "10.0.0.1 10.0.0.2"
- option secret "shared-secret.key"
- option keepalive "10 60"
- option comp_lzo "yes"
- option verb "3"
- option mssfix "1420"
+ option _description 'Simple server configuration for a routed point-to-point VPN'
+ option _role 'server'
+ option dev 'tun'
+ option ifconfig '10.0.0.1 10.0.0.2'
+ option secret 'shared-secret.key'
+ option keepalive '10 60'
+ option verb '3'
+ option mssfix '1420'
#
# Routed point-to-point client
#
config openvpn_recipe client_tun_ptp
- option _description "Simple client configuration for a routed point-to-point VPN"
- option _role "client"
- option dev "tun"
- list remote "vpnserver.example.org"
- option ifconfig "10.0.0.2 10.0.0.1"
- option secret "shared-secret.key"
- option nobind "1"
- option comp_lzo "yes"
- option verb "3"
+ option _description 'Simple client configuration for a routed point-to-point VPN'
+ option _role 'client'
+ option dev 'tun'
+ list remote 'vpnserver.example.org'
+ option ifconfig '10.0.0.2 10.0.0.1'
+ option secret 'shared-secret.key'
+ option nobind '1'
+ option verb '3'
#
# Routed multi-client server
#
config openvpn_recipe server_tun
- option _description "Server configuration for a routed multi-client VPN"
- option _role "server"
- option dev "tun"
- option server "10.0.100.0 255.255.255.0"
- option ca "ca.crt"
- option cert "server.crt"
- option key "server.key"
- option dh "dh1024.pem"
- option keepalive "10 60"
- option comp_lzo "yes"
- option verb "3"
- option mssfix "1420"
+ option _description 'Server configuration for a routed multi-client VPN'
+ option _role 'server'
+ option dev 'tun'
+ option server '10.0.100.0 255.255.255.0'
+ option ca 'ca.crt'
+ option cert 'server.crt'
+ option key 'server.key'
+ option dh 'dh1024.pem'
+ option keepalive '10 60'
+ option verb '3'
+ option mssfix '1420'
#
# Routed client
#
config openvpn_recipe client_tun
- option _description "Client configuration for a routed multi-client VPN"
- option _role "client"
- option client "1"
- option dev "tun"
- list remote "vpnserver.example.org"
- option pkcs12 "my_client.p12"
- option remote_cert_tls "server"
- option comp_lzo "yes"
- option nobind "1"
- option persist_key "1"
- option persist_tun "1"
- option verb "3"
- option reneg_sec "0"
- option float "1"
+ option _description 'Client configuration for a routed multi-client VPN'
+ option _role 'client'
+ option client '1'
+ option dev 'tun'
+ list remote 'vpnserver.example.org'
+ option pkcs12 'my_client.p12'
+ option remote_cert_tls 'server'
+ option nobind '1'
+ option persist_key '1'
+ option persist_tun '1'
+ option verb '3'
+ option reneg_sec '0'
+ option float '1'
#
# Multi-client ethernet bridge server
#
config openvpn_recipe server_tap_bridge
- option _description "Server configuration for an ethernet bridge VPN"
- option _role "server"
- option dev "tap"
- option server_bridge "192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254"
- option ca "ca.crt"
- option cert "server.crt"
- option key "server.key"
- option dh "dh1024.pem"
- option keepalive "10 60"
- option comp_lzo "yes"
- option verb "3"
- option mssfix "1420"
+ option _description 'Server configuration for an ethernet bridge VPN'
+ option _role 'server'
+ option dev 'tap'
+ option server_bridge '192.168.1.1 255.255.255.0 192.168.1.128 192.168.1.254'
+ option ca 'ca.crt'
+ option cert 'server.crt'
+ option key 'server.key'
+ option dh 'dh1024.pem'
+ option keepalive '10 60'
+ option verb '3'
+ option mssfix '1420'
#
# Ethernet bridge client
#
config openvpn_recipe client_tap_bridge
- option _description "Client configuration for an ethernet bridge VPN"
- option _role "client"
- option client "1"
- option dev "tap"
- list remote "vpnserver.example.org"
- option ca "ca.crt"
- option cert "my_client.crt"
- option key "my_client.key"
- option dh "dh1024.pem"
- option remote_cert_tls "server"
- option comp_lzo "yes"
- option nobind "1"
- option persist_key "1"
- option verb "3"
- option reneg_sec "0"
- option float "1"
-
+ option _description 'Client configuration for an ethernet bridge VPN'
+ option _role 'client'
+ option client '1'
+ option dev 'tap'
+ list remote 'vpnserver.example.org'
+ option ca 'ca.crt'
+ option cert 'my_client.crt'
+ option key 'my_client.key'
+ option dh 'dh1024.pem'
+ option remote_cert_tls 'server'
+ option nobind '1'
+ option persist_key '1'
+ option verb '3'
+ option reneg_sec '0'
+ option float '1'
diff --git a/applications/luci-app-p910nd/po/zh-cn/p910nd.po b/applications/luci-app-p910nd/po/zh-cn/p910nd.po
index c14e2e7cba..f57a8de4c9 100644
--- a/applications/luci-app-p910nd/po/zh-cn/p910nd.po
+++ b/applications/luci-app-p910nd/po/zh-cn/p910nd.po
@@ -1,17 +1,20 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-19 19:35+0200\n"
-"PO-Revision-Date: 2014-06-22 14:36+0200\n"
-"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
-"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"PO-Revision-Date: 2018-08-07 20:00+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Bidirectional mode"
msgstr "åŒå‘模å¼"
@@ -22,7 +25,7 @@ msgstr "设备"
msgid ""
"First you have to install the packages to get support for USB (kmod-usb-"
"printer) or parallel port (kmod-lp)."
-msgstr "必须安装支æŒUSB打å°æœºçš„驱动(kmod-usb-printer)或者并å£é©±åŠ¨(kmod-lp)"
+msgstr "必须安装 USB 打å°æœºé©±åŠ¨ï¼ˆkmod-usb-printer)或者并å£é©±åŠ¨ï¼ˆkmod-lp)。"
msgid "Interface"
msgstr "接å£"
@@ -34,16 +37,16 @@ msgid "Settings"
msgstr "设置"
msgid "Specifies the interface to listen on."
-msgstr "指定监å¬ç«¯å£"
+msgstr "指定监å¬ç«¯å£ã€‚"
msgid "TCP listener port."
-msgstr "TCP监å¬ç«¯å£"
+msgstr "TCP 监å¬ç«¯å£ã€‚"
msgid "enable"
msgstr "å¯ç”¨"
msgid "p910nd - Printer server"
-msgstr "打å°æœåŠ¡å™¨"
+msgstr "p910nd - 打å°æœåŠ¡å™¨"
#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
#~ msgstr "p910nd 的监å¬ç«¯å£æ˜¯910+N,举例:9100用于监å¬ç¬¬ä¸€å°æ‰“å°æœº"
diff --git a/applications/luci-app-p910nd/po/zh-tw/p910nd.po b/applications/luci-app-p910nd/po/zh-tw/p910nd.po
index e6f6313374..44a56f4435 100644
--- a/applications/luci-app-p910nd/po/zh-tw/p910nd.po
+++ b/applications/luci-app-p910nd/po/zh-tw/p910nd.po
@@ -1,45 +1,52 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-18 20:03+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: 2018-08-07 20:00+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Bidirectional mode"
msgstr "é›™å‘模å¼"
msgid "Device"
-msgstr "設備"
+msgstr "è£ç½®"
msgid ""
"First you have to install the packages to get support for USB (kmod-usb-"
"printer) or parallel port (kmod-lp)."
-msgstr ""
-"首先您必須安è£è»Ÿé«”包以便ç²å¾—USB (kmod-usb-printer)或串列埠(kmod-lp)的支æ´."
+msgstr "å¿…é ˆå®‰è£ USB å°è¡¨æ©Ÿé©…動(kmod-usb-printer)或者並å£é©…動(kmod-lp)。"
msgid "Interface"
-msgstr ""
+msgstr "介é¢"
msgid "Port"
msgstr "埠"
msgid "Settings"
-msgstr "設定值"
+msgstr "設定"
msgid "Specifies the interface to listen on."
-msgstr ""
+msgstr "指定監è½åŸ ã€‚"
msgid "TCP listener port."
-msgstr "è†è½TCP埠"
+msgstr "TCP 監è½åŸ ã€‚"
msgid "enable"
msgstr "啟用"
msgid "p910nd - Printer server"
-msgstr "p910nd - å°è¡¨æ©Ÿä¼ºæœå™¨"
+msgstr "p910nd - 列å°ä¼ºæœå™¨"
+
+#~ msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+#~ msgstr "p910nd 的監è½åŸ æ˜¯910+N,舉例:9100用於監è½ç¬¬ä¸€è‡ºå°è¡¨æ©Ÿ"
diff --git a/applications/luci-app-pagekitec/po/zh-cn/pagekitec.po b/applications/luci-app-pagekitec/po/zh-cn/pagekitec.po
new file mode 100644
index 0000000000..17c8b1df1c
--- /dev/null
+++ b/applications/luci-app-pagekitec/po/zh-cn/pagekitec.po
@@ -0,0 +1,56 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 20:08+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid ""
+"<p/>Note: you need a working PageKite account, or at least, your own running "
+"front end for this form to work. Visit <a href=\"https://pagekite.net/home/"
+"\">your account</a> to set up a name for your router and get a secret key "
+"for the connection. <p/><em>Note: this web configurator only supports some "
+"very very basic uses of pagekite.</em>"
+msgstr ""
+"<p/>注æ„:您需è¦ä¸€ä¸ªæœ‰æ•ˆçš„ PageKite å¸æˆ·ï¼Œæˆ–者至少需è¦ä¸€ä¸ªè‡ªå·±çš„è¿è¡Œå‰ç«¯æ‰èƒ½"
+"使用此表å•ã€‚访问<a href=\"https://pagekite.net/home/\">您的å¸æˆ·</a>,为路由器"
+"设置å称,并获å–连接的密钥。<p /><em>注æ„:此 Web é…置程åºä»…支æŒä¸€äº›éžå¸¸åŸºæœ¬"
+"的 pagekite 用途。</em>"
+
+msgid "Basic HTTP"
+msgstr "基本 HTTP"
+
+msgid "Basic SSH"
+msgstr "基本 SSH"
+
+msgid ""
+"Enable a tunnel to the local HTTP server (in most cases, this admin site)"
+msgstr "å¯ç”¨åˆ°æœ¬åœ° HTTP æœåŠ¡å™¨çš„隧é“(大多数情况下为此管ç†ç«™ç‚¹ï¼‰"
+
+msgid "Enable a tunnel to the local SSH server"
+msgstr "å¯ç”¨åˆ°æœ¬åœ° SSH æœåŠ¡å™¨çš„隧é“"
+
+msgid "Kite Name"
+msgstr "Kite å称"
+
+msgid "Kite Secret"
+msgstr "Kite 密ç "
+
+msgid "PageKite"
+msgstr "PageKite"
+
+msgid "Static Setup"
+msgstr "é™æ€è®¾ç½®"
+
+msgid ""
+"Static setup, disable FE failover and DDNS updates, set this if you are "
+"running your own frontend without a pagekite.me account"
+msgstr ""
+"é™æ€è®¾ç½®ï¼Œç¦ç”¨ FE 故障转移和 DDNS 更新,如果您没有 pagekite.me å¸æˆ·è€Œè¿è¡Œè‡ªå·±"
+"çš„å‰ç«¯ï¼Œè¯·è®¾ç½®æ­¤é¡¹"
diff --git a/applications/luci-app-pagekitec/po/zh-tw/pagekitec.po b/applications/luci-app-pagekitec/po/zh-tw/pagekitec.po
new file mode 100644
index 0000000000..c61afc389f
--- /dev/null
+++ b/applications/luci-app-pagekitec/po/zh-tw/pagekitec.po
@@ -0,0 +1,56 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 20:08+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid ""
+"<p/>Note: you need a working PageKite account, or at least, your own running "
+"front end for this form to work. Visit <a href=\"https://pagekite.net/home/"
+"\">your account</a> to set up a name for your router and get a secret key "
+"for the connection. <p/><em>Note: this web configurator only supports some "
+"very very basic uses of pagekite.</em>"
+msgstr ""
+"<p/>注æ„:您需è¦ä¸€å€‹æœ‰æ•ˆçš„ PageKite 帳戶,或者至少需è¦ä¸€å€‹è‡ªå·±çš„執行å‰ç«¯æ‰èƒ½"
+"使用此表單。訪å•<a href=\"https://pagekite.net/home/\">您的帳戶</a>,為路由器"
+"設定å稱,並ç²å–連線的金鑰。<p /><em>注æ„:此 Web é…置程å¼åƒ…支æ´ä¸€äº›éžå¸¸åŸºæœ¬"
+"的 pagekite 用途。</em>"
+
+msgid "Basic HTTP"
+msgstr "基本 HTTP"
+
+msgid "Basic SSH"
+msgstr "基本 SSH"
+
+msgid ""
+"Enable a tunnel to the local HTTP server (in most cases, this admin site)"
+msgstr "啟用到本地 HTTP 伺æœå™¨çš„隧é“(大多數情æ³ä¸‹ç‚ºæ­¤ç®¡ç†ç«™é»žï¼‰"
+
+msgid "Enable a tunnel to the local SSH server"
+msgstr "啟用到本地 SSH 伺æœå™¨çš„隧é“"
+
+msgid "Kite Name"
+msgstr "Kite å稱"
+
+msgid "Kite Secret"
+msgstr "Kite 密碼"
+
+msgid "PageKite"
+msgstr "PageKite"
+
+msgid "Static Setup"
+msgstr "éœæ…‹è¨­å®š"
+
+msgid ""
+"Static setup, disable FE failover and DDNS updates, set this if you are "
+"running your own frontend without a pagekite.me account"
+msgstr ""
+"éœæ…‹è¨­å®šï¼Œç¦ç”¨ FE 故障轉移和 DDNS 更新,如果您沒有 pagekite.me 帳戶而執行自己"
+"çš„å‰ç«¯ï¼Œè«‹è¨­å®šæ­¤é …"
diff --git a/applications/luci-app-radicale/Makefile b/applications/luci-app-radicale/Makefile
index 2b969ace50..87180e77d6 100644
--- a/applications/luci-app-radicale/Makefile
+++ b/applications/luci-app-radicale/Makefile
@@ -14,10 +14,10 @@ PKG_VERSION:=1.1.0
# Release == build
# increase on changes of translation files
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
-PKG_MAINTAINER:=Christian Schoenebeck <christian.schoenebeck@gmail.com>
+PKG_MAINTAINER:=
# LuCI specific settings
LUCI_TITLE:=LuCI Support for Radicale CardDAV/CalDAV
diff --git a/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua b/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua
index e5c0a1bed0..2a1399b96b 100644
--- a/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua
+++ b/applications/luci-app-samba4/luasrc/model/cbi/samba4.lua
@@ -15,9 +15,20 @@ h = s:taboption("general", Flag, "homes", translate("Share home-directories"),
translate("Allow system users to reach their home directories via " ..
"network shares"))
h.rmempty = false
-s:taboption("general", Flag, "disable_netbios", translate("Disable Netbios"))
-s:taboption("general", Flag, "disable_ad_dc", translate("Disable Active Directory Domain Controller"))
-s:taboption("general", Flag, "disable_winbind", translate("Disable Winbind"))
+
+macos = s:taboption("general", Flag, "macos", translate("Enable macOS compatible shares"),
+ translate("Enables Apple's AAPL extension globally and adds macOS compatibility options to all shares."))
+macos.rmempty = false
+
+if nixio.fs.access("/usr/sbin/nmbd") then
+ s:taboption("general", Flag, "disable_netbios", translate("Disable Netbios"))
+end
+if nixio.fs.access("/usr/sbin/samba") then
+ s:taboption("general", Flag, "disable_ad_dc", translate("Disable Active Directory Domain Controller"))
+end
+if nixio.fs.access("/usr/sbin/winbindd") then
+ s:taboption("general", Flag, "disable_winbind", translate("Disable Winbind"))
+end
tmpl = s:taboption("template", Value, "_tmpl",
translate("Edit the template that is used for generating the samba configuration."),
@@ -49,42 +60,53 @@ if nixio.fs.access("/etc/config/fstab") then
pth.titleref = luci.dispatcher.build_url("admin", "system", "fstab")
end
-s:option(Value, "users", translate("Allowed users")).rmempty = true
+br = s:option(Flag, "browseable", translate("Browse-able"))
+br.enabled = "yes"
+br.disabled = "no"
+br.default = "yes"
ro = s:option(Flag, "read_only", translate("Read-only"))
-ro.rmempty = false
ro.enabled = "yes"
ro.disabled = "no"
+ro.default = "yes"
-br = s:option(Flag, "browseable", translate("Browseable"))
-br.rmempty = false
-br.default = "yes"
-br.enabled = "yes"
-br.disabled = "no"
+s:option(Flag, "force_root", translate("Force Root"))
+
+au = s:option(Value, "users", translate("Allowed users"))
+au.rmempty = true
go = s:option(Flag, "guest_ok", translate("Allow guests"))
-go.rmempty = false
go.enabled = "yes"
go.disabled = "no"
+go.default = "no"
gon = s:option(Flag, "guest_only", translate("Guests only"))
-gon.rmempty = false
gon.enabled = "yes"
gon.disabled = "no"
+gon.default = "no"
-io = s:option(Flag, "inherit_owner", translate("Inherit owner"))
-io.rmempty = false
-io.enabled = "yes"
-io.disabled = "no"
+iown = s:option(Flag, "inherit_owner", translate("Inherit owner"))
+iown.enabled = "yes"
+iown.disabled = "no"
+iown.default = "no"
cm = s:option(Value, "create_mask", translate("Create mask"))
cm.rmempty = true
-cm.size = 4
+cm.maxlength = 4
+cm.placeholder = "0666"
dm = s:option(Value, "dir_mask", translate("Directory mask"))
dm.rmempty = true
-dm.size = 4
+dm.maxlength = 4
+dm.placeholder = "0777"
+
+vfs = s:option(Value, "vfs_objects", translate("Vfs objects"))
+vfs.rmempty = true
+
+s:option(Flag, "timemachine", translate("Apple Time-machine share"))
-s:option(Value, "vfs_objects", translate("Vfs objects")).rmempty = true
+tms = s:option(Value, "timemachine_maxsize", translate("Time-machine size in GB"))
+tms.rmempty = true
+tms.maxlength = 5
return m
diff --git a/applications/luci-app-samba4/po/ca/samba4.po b/applications/luci-app-samba4/po/ca/samba4.po
index ddd306d07a..0183f56b70 100644
--- a/applications/luci-app-samba4/po/ca/samba4.po
+++ b/applications/luci-app-samba4/po/ca/samba4.po
@@ -26,7 +26,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Usuaris permesos"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -53,6 +56,17 @@ msgstr "Edita plantilla"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Edita la plantilla que s'usa per generar la configuració de samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Ajusts generals"
@@ -99,6 +113,9 @@ msgstr ""
"barra ('|') no es deuen canviar. Reben els seus valors de la pestanya "
"'Ajusts generals'."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/cs/samba4.po b/applications/luci-app-samba4/po/cs/samba4.po
index a013bcc13e..88cd178367 100644
--- a/applications/luci-app-samba4/po/cs/samba4.po
+++ b/applications/luci-app-samba4/po/cs/samba4.po
@@ -22,7 +22,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Povolení uživatelé"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgstr ""
"Editovat Å¡ablonu, která je použita pro generování konfiguraÄního souboru pro "
"sambu."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Obecné nastavení"
@@ -96,6 +110,9 @@ msgstr ""
"konfigurace samby generována. Hodnoty uzavřené rourou (\"|\"), by se neměly "
"měnit. Tyto hodnoty jsou brány ze záložky \"Obecná nastavení\"."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/de/samba4.po b/applications/luci-app-samba4/po/de/samba4.po
index b9caa61d1c..35a4815284 100644
--- a/applications/luci-app-samba4/po/de/samba4.po
+++ b/applications/luci-app-samba4/po/de/samba4.po
@@ -24,17 +24,20 @@ msgstr ""
msgid "Allowed users"
msgstr "Legitimierte Benutzer"
-msgid "Browseable"
-msgstr "Suchbar"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
+msgstr "Durchsuchbar"
msgid "Create mask"
-msgstr "Berechtigungsmaske für neue Dateien"
+msgstr "Berechtigungs-maske für neue Dateien"
msgid "Description"
msgstr "Beschreibung"
msgid "Directory mask"
-msgstr "Verzeichnismaske"
+msgstr "Verzeichnis-maske"
msgid "Disable Active Directory Domain Controller"
msgstr "Deaktiviere Active Directory Domain Controller"
@@ -53,6 +56,17 @@ msgstr ""
"Hier kann das Template bearbeitet werden, das zur Erstellung der Samba-"
"Konfigurationsdateien verwendet wird."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Allgemeine Einstellungen"
@@ -69,7 +83,7 @@ msgid "Name"
msgstr "Name"
msgid "Network Shares"
-msgstr "Netzwerkfreigaben"
+msgstr "Netzwerk-freigaben"
msgid "Path"
msgstr "Pfad"
@@ -83,7 +97,7 @@ msgid "Read-only"
msgstr "Nur Lesen"
msgid "Share home-directories"
-msgstr "Heimatverzeichnisse freigeben"
+msgstr "Heimat-verzeichnisse freigeben"
msgid "Shared Directories"
msgstr "Freigegebene Verzeichnisse"
@@ -100,12 +114,18 @@ msgstr ""
"werden, da diese beim Erstellen der Konfiguration mit den Werten aus dem Tab "
"'Allgemeine Einstellungen' ersetzt werden."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
-msgstr "Virtuelle Filesystem Module"
+msgstr ""
msgid "Workgroup"
msgstr "Arbeitsgruppe"
+#~ msgid "Browseable"
+#~ msgstr "Suchbar"
+
#~ msgid "Mask for new directories"
#~ msgstr "Maske für neue Verzeichnisse"
diff --git a/applications/luci-app-samba4/po/el/samba4.po b/applications/luci-app-samba4/po/el/samba4.po
index 946915f74d..88999d4071 100644
--- a/applications/luci-app-samba4/po/el/samba4.po
+++ b/applications/luci-app-samba4/po/el/samba4.po
@@ -22,7 +22,10 @@ msgstr ""
msgid "Allowed users"
msgstr ""
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -49,6 +52,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -91,6 +105,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/en/samba4.po b/applications/luci-app-samba4/po/en/samba4.po
index 75ef0f96e9..35ecc99e25 100644
--- a/applications/luci-app-samba4/po/en/samba4.po
+++ b/applications/luci-app-samba4/po/en/samba4.po
@@ -22,7 +22,10 @@ msgstr "Allow system users to reach their home directories via network shares"
msgid "Allowed users"
msgstr "Allowed users"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -49,6 +52,17 @@ msgstr "Edit template"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Edit the template that is used for generating the Samba configuration."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "General settings"
@@ -95,6 +109,9 @@ msgstr ""
"('|') should not be changed. They get their values from the 'General "
"settings' tab."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/es/samba4.po b/applications/luci-app-samba4/po/es/samba4.po
index 1e6b8fd368..99d64f970b 100644
--- a/applications/luci-app-samba4/po/es/samba4.po
+++ b/applications/luci-app-samba4/po/es/samba4.po
@@ -24,7 +24,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Usuarios permitidos"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgstr "Editar plantilla"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Editar la plantilla usada para generar la configuración de samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Configuración general"
@@ -96,6 +110,9 @@ msgstr ""
"generará la configuración de samba. Los valores entre tuberías ('|') no "
"deben cambiarse. Su valor se toma desde la pestaña 'Configuración General'."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/fr/samba4.po b/applications/luci-app-samba4/po/fr/samba4.po
index 53212311cf..a5b7dc7935 100644
--- a/applications/luci-app-samba4/po/fr/samba4.po
+++ b/applications/luci-app-samba4/po/fr/samba4.po
@@ -24,7 +24,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Utilisateurs autorisés"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgstr "Éditer le modèle"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Éditer le modèle utilisé pour générer la configuration Samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Paramètres généraux"
@@ -97,6 +111,9 @@ msgstr ""
" (« | ») ne doivent pas être modifiées, elles proviennent de l'onglet "
"« Paramètres généraux »."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/he/samba4.po b/applications/luci-app-samba4/po/he/samba4.po
index 3f670e6c2d..859dd8d896 100644
--- a/applications/luci-app-samba4/po/he/samba4.po
+++ b/applications/luci-app-samba4/po/he/samba4.po
@@ -17,7 +17,10 @@ msgstr ""
msgid "Allowed users"
msgstr ""
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -44,6 +47,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -86,6 +100,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/hu/samba4.po b/applications/luci-app-samba4/po/hu/samba4.po
index 08ff729f4b..8dbe91558d 100644
--- a/applications/luci-app-samba4/po/hu/samba4.po
+++ b/applications/luci-app-samba4/po/hu/samba4.po
@@ -22,7 +22,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Engedélyezett felhasználók"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgstr ""
"Itt szerkesztheti a sablont, ami a végleges samba konfiguráció "
"elkészítéséhez kerül felhasználásra."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Ãltalános beállítások"
@@ -97,6 +111,9 @@ msgstr ""
"közé zárt értékek módosítása nem szükséges, az értéküket az általános "
"beállítások fülről kapják."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/it/samba4.po b/applications/luci-app-samba4/po/it/samba4.po
index 93359d7ba7..d7f5631965 100644
--- a/applications/luci-app-samba4/po/it/samba4.po
+++ b/applications/luci-app-samba4/po/it/samba4.po
@@ -24,8 +24,11 @@ msgstr ""
msgid "Allowed users"
msgstr "Utenti ammessi"
-msgid "Browseable"
-msgstr "Sfogliabile"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
+msgstr ""
msgid "Create mask"
msgstr "Crea maschera"
@@ -52,6 +55,17 @@ msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
"Modifica il template utilizzato per generare la configurazione di samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Opzioni Generali"
@@ -100,12 +114,18 @@ msgstr ""
"('|') non dovrebbero essere toccati. Essi vengono generati dalla schermata "
"'Opzioni Generali'."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
msgid "Workgroup"
msgstr "Gruppo di lavoro"
+#~ msgid "Browseable"
+#~ msgstr "Sfogliabile"
+
#~ msgid "Mask for new directories"
#~ msgstr "Maschera per le nuove cartelle"
diff --git a/applications/luci-app-samba4/po/ja/samba4.po b/applications/luci-app-samba4/po/ja/samba4.po
index 3c75275c0b..1358c2bd0e 100644
--- a/applications/luci-app-samba4/po/ja/samba4.po
+++ b/applications/luci-app-samba4/po/ja/samba4.po
@@ -3,14 +3,14 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2017-08-16 00:41+0900\n"
+"PO-Revision-Date: 2018-08-06 05:17+0900\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Language: ja\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: Poedit 2.0.3\n"
+"X-Generator: Poedit 2.1.1\n"
"Language-Team: \n"
msgid "Allow guests"
@@ -22,7 +22,10 @@ msgstr "sambaを介ã—ã¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ›ãƒ¼ãƒ ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®ã‚¢ã‚¯ã
msgid "Allowed users"
msgstr "許å¯ã•ã‚ŒãŸãƒ¦ãƒ¼ã‚¶ãƒ¼"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -35,13 +38,13 @@ msgid "Directory mask"
msgstr "ディレクトリã®ãƒžã‚¹ã‚¯"
msgid "Disable Active Directory Domain Controller"
-msgstr ""
+msgstr "Active Directory ドメインコントローラを無効化"
msgid "Disable Netbios"
-msgstr ""
+msgstr "Netbios を無効化"
msgid "Disable Winbind"
-msgstr ""
+msgstr "Winbind を無効化"
msgid "Edit Template"
msgstr "テンプレートã®ç·¨é›†"
@@ -49,17 +52,28 @@ msgstr "テンプレートã®ç·¨é›†"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "samba設定を生æˆã™ã‚‹ãƒ†ãƒ³ãƒ—レートを編集ã—ã¾ã™ã€‚"
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "一般設定"
msgid "Guests only"
-msgstr ""
+msgstr "ゲストã®ã¿"
msgid "Hostname"
msgstr "ホストå"
msgid "Inherit owner"
-msgstr ""
+msgstr "オーナーã®ç¶™æ‰¿"
msgid "Name"
msgstr "åå‰"
@@ -96,6 +110,9 @@ msgstr ""
"容ã§ã™ã€‚パイプ('|')ã§é–‰ã˜ã‚‰ã‚ŒãŸå€¤ã¯å¤‰æ›´ã—ãªã„ã§ãã ã•ã„。ã“れらã®å€¤ã¯'一般設"
"定'タブ内ã®å€¤ã«ã‚ˆã£ã¦ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚"
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/ms/samba4.po b/applications/luci-app-samba4/po/ms/samba4.po
index 9e138471d0..c6ca22fba0 100644
--- a/applications/luci-app-samba4/po/ms/samba4.po
+++ b/applications/luci-app-samba4/po/ms/samba4.po
@@ -16,7 +16,10 @@ msgstr ""
msgid "Allowed users"
msgstr ""
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -43,6 +46,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -85,6 +99,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/no/samba4.po b/applications/luci-app-samba4/po/no/samba4.po
index 6e84259337..8742cbb0a5 100644
--- a/applications/luci-app-samba4/po/no/samba4.po
+++ b/applications/luci-app-samba4/po/no/samba4.po
@@ -13,7 +13,10 @@ msgstr "Tillat systembrukere å nå sine hjemmekataloger via nettverks mapper."
msgid "Allowed users"
msgstr "Tillatte brukere"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -40,6 +43,17 @@ msgstr "Rediger Mal"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Rediger malen som brukes til å generere samba konfigurasjonen."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Generelle Innstillinger"
@@ -85,6 +99,9 @@ msgstr ""
"konfigurasjon vil bli generert fra. Verdier omsluttet av ('|') bør ikke "
"endres. De får sine verdier fra 'Generelle Innstillinger' fanen."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/pl/samba4.po b/applications/luci-app-samba4/po/pl/samba4.po
index aec7082d53..faad499c46 100644
--- a/applications/luci-app-samba4/po/pl/samba4.po
+++ b/applications/luci-app-samba4/po/pl/samba4.po
@@ -23,7 +23,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Użytkownicy z prawem dostępu"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -50,6 +53,17 @@ msgstr "Edytuj szablon"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Edytuj szablon, który jest używany do generowania konfiguracji samby."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Ustawienia ogólne"
@@ -96,6 +110,9 @@ msgstr ""
"kreski pionowej ('|') nie powinny być zmieniane. Wartości ich zostaną "
"pobrane z zakładki \"Ustawienia ogólne\"."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/pt-br/samba4.po b/applications/luci-app-samba4/po/pt-br/samba4.po
index 8f6dbb6c99..5383aa32de 100644
--- a/applications/luci-app-samba4/po/pt-br/samba4.po
+++ b/applications/luci-app-samba4/po/pt-br/samba4.po
@@ -24,7 +24,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Usuários permitidos"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgstr "Editar modelo"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Edita o modelo que é usado para gerar a configuração do samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Configurações Gerais"
@@ -97,6 +111,9 @@ msgstr ""
"não devem ser alterados. Estes valores serão obtidos a partir da aba "
"'Configurações Gerais'."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/pt/samba4.po b/applications/luci-app-samba4/po/pt/samba4.po
index 2f8f2dafc0..50c1645f0c 100644
--- a/applications/luci-app-samba4/po/pt/samba4.po
+++ b/applications/luci-app-samba4/po/pt/samba4.po
@@ -24,7 +24,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Utilizadores Permitidos"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgstr "Editar Template"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Editar a template que é utilizada para gerar a configuração samba"
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Definições Gerais"
@@ -97,6 +111,9 @@ msgstr ""
"| não devem ser alterados. Eles recebem os valores do separador 'Definições "
"Gerais'."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/ro/samba4.po b/applications/luci-app-samba4/po/ro/samba4.po
index d9f698971e..b481b1f952 100644
--- a/applications/luci-app-samba4/po/ro/samba4.po
+++ b/applications/luci-app-samba4/po/ro/samba4.po
@@ -23,7 +23,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Utilizatori acceptati"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -50,6 +53,17 @@ msgstr "Editeaza sablon"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "Editeaza sablonul care e folosit pentru generarea configuratiei samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Setari generale"
@@ -95,6 +109,9 @@ msgstr ""
"genereaza configuratia samba. Valorile dintre liniuta verticala ('|') n-ar "
"trebui schimbate, ele iau valorile direct din tab-ul de \"Setari generale\"."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/ru/samba4.po b/applications/luci-app-samba4/po/ru/samba4.po
index f588424d95..f7ec3269eb 100644
--- a/applications/luci-app-samba4/po/ru/samba4.po
+++ b/applications/luci-app-samba4/po/ru/samba4.po
@@ -26,8 +26,11 @@ msgstr ""
msgid "Allowed users"
msgstr "Разрешенные пользователи"
-msgid "Browseable"
-msgstr "Виден в ÑпиÑке доÑтупных реÑурÑов"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
+msgstr ""
msgid "Create mask"
msgstr "Создать маÑку"
@@ -53,6 +56,17 @@ msgstr "ÐаÑтройка config файла"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "ÐаÑтройка config<br />файла samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "ОÑновные наÑтройки"
@@ -101,12 +115,18 @@ msgstr ""
"('|'), не должны быть изменены.<br />Они будут автоматичеÑки заменены на "
"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñо Ñтраницы 'ОÑновные наÑтройки'."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
msgid "Workgroup"
msgstr "Ð Ð°Ð±Ð¾Ñ‡Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
+#~ msgid "Browseable"
+#~ msgstr "Виден в ÑпиÑке доÑтупных реÑурÑов"
+
#~ msgid "Mask for new directories"
#~ msgstr "МаÑка Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… папок"
diff --git a/applications/luci-app-samba4/po/sk/samba4.po b/applications/luci-app-samba4/po/sk/samba4.po
index 53e8e214ea..44299ac1aa 100644
--- a/applications/luci-app-samba4/po/sk/samba4.po
+++ b/applications/luci-app-samba4/po/sk/samba4.po
@@ -17,7 +17,10 @@ msgstr ""
msgid "Allowed users"
msgstr ""
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -44,6 +47,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -86,6 +100,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/sv/samba4.po b/applications/luci-app-samba4/po/sv/samba4.po
index d9c0cc0df9..39695eb0b7 100644
--- a/applications/luci-app-samba4/po/sv/samba4.po
+++ b/applications/luci-app-samba4/po/sv/samba4.po
@@ -18,7 +18,10 @@ msgstr "Tillåt systemanvändare att nå deras hem-mappar via nätverksdelningar
msgid "Allowed users"
msgstr "Tillåtna användare"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -46,6 +49,17 @@ msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
"Redigera mallen som används för att generera konfigurationen för samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Generella inställningar"
@@ -88,6 +102,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/templates/samba4.pot b/applications/luci-app-samba4/po/templates/samba4.pot
index 3041807b14..33142d047c 100644
--- a/applications/luci-app-samba4/po/templates/samba4.pot
+++ b/applications/luci-app-samba4/po/templates/samba4.pot
@@ -10,7 +10,10 @@ msgstr ""
msgid "Allowed users"
msgstr ""
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -37,6 +40,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -79,6 +93,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/tr/samba4.po b/applications/luci-app-samba4/po/tr/samba4.po
index 1c233f1ec3..4368fb2710 100644
--- a/applications/luci-app-samba4/po/tr/samba4.po
+++ b/applications/luci-app-samba4/po/tr/samba4.po
@@ -17,7 +17,10 @@ msgstr ""
msgid "Allowed users"
msgstr ""
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -44,6 +47,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -86,6 +100,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/uk/samba4.po b/applications/luci-app-samba4/po/uk/samba4.po
index e228baec2e..a4f7e5a02b 100644
--- a/applications/luci-app-samba4/po/uk/samba4.po
+++ b/applications/luci-app-samba4/po/uk/samba4.po
@@ -23,7 +23,10 @@ msgstr ""
msgid "Allowed users"
msgstr "Дозволені кориÑтувачі"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
msgid "Create mask"
@@ -51,6 +54,17 @@ msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
"Редагувати шаблон, Ñкий викориÑтовуєтьÑÑ Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ— samba."
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "Загальні наÑтройки"
@@ -97,6 +111,9 @@ msgstr ""
"\" (\"|\") не повинні змінюватиÑÑ. Вони отримують Ñвої Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð· вкладки "
"\"Загальні налаштуваннÑ\"."
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/vi/samba4.po b/applications/luci-app-samba4/po/vi/samba4.po
index b176471b0d..d597628229 100644
--- a/applications/luci-app-samba4/po/vi/samba4.po
+++ b/applications/luci-app-samba4/po/vi/samba4.po
@@ -28,7 +28,10 @@ msgstr ""
msgid "Allowed users"
msgstr "NgÆ°á»i sá»­ dụng được cho phép"
-msgid "Browseable"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
msgstr ""
#, fuzzy
@@ -57,6 +60,17 @@ msgstr ""
msgid "Edit the template that is used for generating the samba configuration."
msgstr ""
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr ""
@@ -100,6 +114,9 @@ msgid ""
"Settings' tab."
msgstr ""
+msgid "Time-machine size in GB"
+msgstr ""
+
msgid "Vfs objects"
msgstr ""
diff --git a/applications/luci-app-samba4/po/zh-cn/samba4.po b/applications/luci-app-samba4/po/zh-cn/samba4.po
index 3790355d9a..f49abac4e9 100644
--- a/applications/luci-app-samba4/po/zh-cn/samba4.po
+++ b/applications/luci-app-samba4/po/zh-cn/samba4.po
@@ -1,12 +1,12 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2017-10-29 15:36+0800\n"
+"PO-Revision-Date: 2018-08-07 20:10+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -25,8 +25,11 @@ msgstr "å…许系统用户通过网络共享访问他们的家目录"
msgid "Allowed users"
msgstr "å…许用户"
-msgid "Browseable"
-msgstr "å¯æµè§ˆ"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
+msgstr ""
msgid "Create mask"
msgstr "创建æƒé™æŽ©ç "
@@ -38,13 +41,13 @@ msgid "Directory mask"
msgstr "目录æƒé™æŽ©ç "
msgid "Disable Active Directory Domain Controller"
-msgstr ""
+msgstr "ç¦ç”¨ Active Directory 域控制器"
msgid "Disable Netbios"
-msgstr ""
+msgstr "ç¦ç”¨ Netbios"
msgid "Disable Winbind"
-msgstr ""
+msgstr "ç¦ç”¨ Winbind"
msgid "Edit Template"
msgstr "编辑模æ¿"
@@ -52,17 +55,28 @@ msgstr "编辑模æ¿"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "编辑用æ¥ç”Ÿæˆ samba 设置的模æ¿"
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "基本设置"
msgid "Guests only"
-msgstr ""
+msgstr "ä»…æ¥å®¾ç”¨æˆ·"
msgid "Hostname"
msgstr "主机å"
msgid "Inherit owner"
-msgstr ""
+msgstr "继承所有者"
msgid "Name"
msgstr "共享å"
@@ -96,12 +110,18 @@ msgstr ""
"è¿™æ˜¯å°†ä»Žå…¶ä¸Šç”Ÿæˆ samba é…置的文件“/etc/samba/smb.conf.templateâ€çš„内容。由管é“"
"符(“|â€ï¼‰åŒ…围的值ä¸åº”更改。它们将从“常规设置â€æ ‡ç­¾ä¸­èŽ·å–其值。"
-msgid "Vfs objects"
+msgid "Time-machine size in GB"
msgstr ""
+msgid "Vfs objects"
+msgstr "VFS 对象"
+
msgid "Workgroup"
msgstr "工作组"
+#~ msgid "Browseable"
+#~ msgstr "å¯æµè§ˆ"
+
#~ msgid "Mask for new directories"
#~ msgstr "新目录æƒé™æŽ©ç "
diff --git a/applications/luci-app-samba4/po/zh-tw/samba4.po b/applications/luci-app-samba4/po/zh-tw/samba4.po
index a897f8957d..ae962f9e82 100644
--- a/applications/luci-app-samba4/po/zh-tw/samba4.po
+++ b/applications/luci-app-samba4/po/zh-tw/samba4.po
@@ -1,12 +1,12 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2017-10-29 15:36+0800\n"
+"PO-Revision-Date: 2018-08-07 20:10+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_TW\n"
@@ -25,8 +25,11 @@ msgstr "å…許系統使用者通éŽç¶²è·¯å…±äº«è¨ªå•ä»–們的家目錄"
msgid "Allowed users"
msgstr "å…許使用者"
-msgid "Browseable"
-msgstr "å¯ç€è¦½"
+msgid "Apple Time-machine share"
+msgstr ""
+
+msgid "Browse-able"
+msgstr ""
msgid "Create mask"
msgstr "建立權é™æŽ©ç¢¼"
@@ -38,13 +41,13 @@ msgid "Directory mask"
msgstr "目錄權é™æŽ©ç¢¼"
msgid "Disable Active Directory Domain Controller"
-msgstr ""
+msgstr "ç¦ç”¨ Active Directory 域控制器"
msgid "Disable Netbios"
-msgstr ""
+msgstr "ç¦ç”¨ Netbios"
msgid "Disable Winbind"
-msgstr ""
+msgstr "ç¦ç”¨ Winbind"
msgid "Edit Template"
msgstr "編輯模æ¿"
@@ -52,17 +55,28 @@ msgstr "編輯模æ¿"
msgid "Edit the template that is used for generating the samba configuration."
msgstr "ç·¨è¼¯ç”¨ä¾†ç”Ÿæˆ samba 設定的模æ¿"
+msgid "Enable macOS compatible shares"
+msgstr ""
+
+msgid ""
+"Enables Apple's AAPL extension globally and adds macOS compatibility options "
+"to all shares."
+msgstr ""
+
+msgid "Force Root"
+msgstr ""
+
msgid "General Settings"
msgstr "基本設定"
msgid "Guests only"
-msgstr ""
+msgstr "僅來賓使用者"
msgid "Hostname"
msgstr "主機å"
msgid "Inherit owner"
-msgstr ""
+msgstr "繼承所有者"
msgid "Name"
msgstr "共享å"
@@ -96,12 +110,18 @@ msgstr ""
"é€™æ˜¯å°‡å¾žå…¶ä¸Šç”Ÿæˆ samba é…置的檔案“/etc/samba/smb.conf.templateâ€çš„內容。由管é“"
"符(“|â€ï¼‰åŒ…åœçš„值ä¸æ‡‰æ›´æ”¹ã€‚它們將從“常è¦è¨­å®šâ€æ¨™ç±¤ä¸­ç²å–其值。"
-msgid "Vfs objects"
+msgid "Time-machine size in GB"
msgstr ""
+msgid "Vfs objects"
+msgstr "VFS 物件"
+
msgid "Workgroup"
msgstr "工作組"
+#~ msgid "Browseable"
+#~ msgstr "å¯ç€è¦½"
+
#~ msgid "Mask for new directories"
#~ msgstr "新目錄權é™æŽ©ç¢¼"
diff --git a/applications/luci-app-shairplay/po/zh-cn/shairplay.po b/applications/luci-app-shairplay/po/zh-cn/shairplay.po
new file mode 100644
index 0000000000..bc2d14ada8
--- /dev/null
+++ b/applications/luci-app-shairplay/po/zh-cn/shairplay.po
@@ -0,0 +1,50 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 20:13+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "AO Device ID"
+msgstr "AO 设备 ID"
+
+msgid "AO Device Name"
+msgstr "AO 设备å"
+
+msgid "AO Driver"
+msgstr "AO 驱动程åº"
+
+msgid "Airport Name"
+msgstr "Airport å称"
+
+msgid "Default"
+msgstr "默认"
+
+msgid "Enabled"
+msgstr "å¯ç”¨"
+
+msgid "HW Address"
+msgstr "硬件地å€"
+
+msgid "Password"
+msgstr "密ç "
+
+msgid "Port"
+msgstr "端å£"
+
+msgid "Respawn"
+msgstr "é‡ç”Ÿ"
+
+msgid "Shairplay"
+msgstr "Shairplay"
+
+msgid ""
+"Shairplay is a simple AirPlay server implementation, here you can configure "
+"the settings."
+msgstr "Shairplay 是一个简å•çš„ AirPlay æœåŠ¡å™¨å®žçŽ°ï¼Œæ‚¨å¯ä»¥åœ¨æ­¤å¤„é…置设置。"
diff --git a/applications/luci-app-shairplay/po/zh-tw/shairplay.po b/applications/luci-app-shairplay/po/zh-tw/shairplay.po
new file mode 100644
index 0000000000..1fd4dc95e6
--- /dev/null
+++ b/applications/luci-app-shairplay/po/zh-tw/shairplay.po
@@ -0,0 +1,50 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"PO-Revision-Date: 2018-08-07 20:14+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
+
+msgid "AO Device ID"
+msgstr "AO è£ç½® ID"
+
+msgid "AO Device Name"
+msgstr "AO è£ç½®å"
+
+msgid "AO Driver"
+msgstr "AO 驅動程å¼"
+
+msgid "Airport Name"
+msgstr "Airport å稱"
+
+msgid "Default"
+msgstr "é è¨­"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "HW Address"
+msgstr "硬體ä½å€"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Port"
+msgstr "埠"
+
+msgid "Respawn"
+msgstr "é‡ç”Ÿ"
+
+msgid "Shairplay"
+msgstr "Shairplay"
+
+msgid ""
+"Shairplay is a simple AirPlay server implementation, here you can configure "
+"the settings."
+msgstr "Shairplay 是一個簡單的 AirPlay 伺æœå™¨å¯¦ç¾ï¼Œæ‚¨å¯ä»¥åœ¨æ­¤è™•é…置設定。"
diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index 38baf58a44..f5c11ac7b7 100644
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -94,6 +94,9 @@ msgstr ""
msgid "Some output"
msgstr ""
+msgid "Start Simple Adblock service"
+msgstr ""
+
msgid "Stop the download if it is stalled for set number of seconds"
msgstr ""
diff --git a/applications/luci-app-statistics/po/zh-tw/statistics.po b/applications/luci-app-statistics/po/zh-tw/statistics.po
index 64f141dd44..f0bfae35da 100644
--- a/applications/luci-app-statistics/po/zh-tw/statistics.po
+++ b/applications/luci-app-statistics/po/zh-tw/statistics.po
@@ -26,7 +26,7 @@ msgid "Action (target)"
msgstr "動作(目標)"
msgid "Add command for reading values"
-msgstr "新增命令讀å–資料"
+msgstr "新增指令讀å–資料"
msgid "Add matching rule"
msgstr "新增匹é…è¦å‰‡"
@@ -35,7 +35,7 @@ msgid "Add multiple hosts separated by space."
msgstr "使用空格分隔多個主機"
msgid "Add notification command"
-msgstr "新增通知命令"
+msgstr "新增通知指令"
msgid "Aggregate number of connected users"
msgstr "連線使用者總數"
@@ -196,7 +196,7 @@ msgid ""
"Here you can define external commands which will be started by collectd in "
"order to read certain values. The values will be read from stdout."
msgstr ""
-"在這裡,您å¯ä»¥å®šç¾©å¤–部命令,Collectd 將啟動命令來ç²å–æŸäº›å€¼ï¼Œå°‡ç²å–的值從標準"
+"在這裡,您å¯ä»¥å®šç¾©å¤–部指令,Collectd 將啟動指令來ç²å–æŸäº›å€¼ï¼Œå°‡ç²å–的值從標準"
"輸出埠輸出。"
msgid ""
@@ -204,8 +204,8 @@ msgid ""
"certain threshold values have been reached. The values leading to invokation "
"will be feeded to the the called programs stdin."
msgstr ""
-"在這裡,您å¯ä»¥å®šç¾©å¤–部命令,當 Collectd é”到一定閾值時,將啟動命令。閥值將會"
-"作為命令的標準輸入。"
+"在這裡,您å¯ä»¥å®šç¾©å¤–部指令,當 Collectd é”到一定閾值時,將啟動指令。閥值將會"
+"作為指令的標準輸入。"
msgid ""
"Here you can define various criteria by which the monitored iptables rules "
@@ -576,7 +576,7 @@ msgid ""
"The exec plugin starts external commands to read values from or to notify "
"external processes when certain threshold values have been reached."
msgstr ""
-"exec 外掛用於當æŸäº›ç›£æŽ§å€¼å·²åˆ°é”閾值時,啟動外部命令讀值或通知外部程å¼ã€‚"
+"exec 外掛用於當æŸäº›ç›£æŽ§å€¼å·²åˆ°é”閾值時,啟動外部指令讀值或通知外部程å¼ã€‚"
msgid ""
"The interface plugin collects traffic statistics on selected interfaces."
diff --git a/applications/luci-app-transmission/po/ca/transmission.po b/applications/luci-app-transmission/po/ca/transmission.po
index 2498393a9c..43f092d55a 100644
--- a/applications/luci-app-transmission/po/ca/transmission.po
+++ b/applications/luci-app-transmission/po/ca/transmission.po
@@ -61,6 +61,9 @@ msgstr ""
msgid "Config file directory"
msgstr "Directori de fitxer de configuració"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT habilitat"
diff --git a/applications/luci-app-transmission/po/cs/transmission.po b/applications/luci-app-transmission/po/cs/transmission.po
index b6166ec03c..f29e8acc5d 100644
--- a/applications/luci-app-transmission/po/cs/transmission.po
+++ b/applications/luci-app-transmission/po/cs/transmission.po
@@ -59,6 +59,9 @@ msgstr "Velikost mezipaměti v MB"
msgid "Config file directory"
msgstr "Složka pro uložení konfiguraÄního souboru"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "Povolit DHT"
diff --git a/applications/luci-app-transmission/po/de/transmission.po b/applications/luci-app-transmission/po/de/transmission.po
index 4b665ff656..ae405b59b8 100644
--- a/applications/luci-app-transmission/po/de/transmission.po
+++ b/applications/luci-app-transmission/po/de/transmission.po
@@ -61,6 +61,9 @@ msgstr "Cache-Größe in MB"
msgid "Config file directory"
msgstr "Verzeichnis für Konfigurationsdatei"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT eingeschaltet"
@@ -142,8 +145,8 @@ msgid ""
"8, Thursday - 16, Friday - 32, Saturday - 64"
msgstr ""
"Zahl/Bitfeld. Starte mit 0, für jeden Tag, an dem die Zeitplanung aktiv sein "
-"soll, füge einen Wert hinzu. Sonntag - 1, Montag - 2, Dienstag - 4, "
-"Mittwoch - 8, Donnerstag - 16, Freitag - 32, Samstag - 64"
+"soll, füge einen Wert hinzu. Sonntag - 1, Montag - 2, Dienstag - 4, Mittwoch "
+"- 8, Donnerstag - 16, Freitag - 32, Samstag - 64"
msgid "Off"
msgstr "Aus"
diff --git a/applications/luci-app-transmission/po/el/transmission.po b/applications/luci-app-transmission/po/el/transmission.po
index 3125fc2751..2b6f6247e0 100644
--- a/applications/luci-app-transmission/po/el/transmission.po
+++ b/applications/luci-app-transmission/po/el/transmission.po
@@ -46,6 +46,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/en/transmission.po b/applications/luci-app-transmission/po/en/transmission.po
index 3125fc2751..2b6f6247e0 100644
--- a/applications/luci-app-transmission/po/en/transmission.po
+++ b/applications/luci-app-transmission/po/en/transmission.po
@@ -46,6 +46,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/es/transmission.po b/applications/luci-app-transmission/po/es/transmission.po
index 9eeb2fb6bc..ab2fbf8db3 100644
--- a/applications/luci-app-transmission/po/es/transmission.po
+++ b/applications/luci-app-transmission/po/es/transmission.po
@@ -61,6 +61,9 @@ msgstr "Tamaño de la caché en MB"
msgid "Config file directory"
msgstr "Directorio del fichero de configuración"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT activado"
diff --git a/applications/luci-app-transmission/po/fr/transmission.po b/applications/luci-app-transmission/po/fr/transmission.po
index 3125fc2751..2b6f6247e0 100644
--- a/applications/luci-app-transmission/po/fr/transmission.po
+++ b/applications/luci-app-transmission/po/fr/transmission.po
@@ -46,6 +46,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/he/transmission.po b/applications/luci-app-transmission/po/he/transmission.po
index 3125fc2751..2b6f6247e0 100644
--- a/applications/luci-app-transmission/po/he/transmission.po
+++ b/applications/luci-app-transmission/po/he/transmission.po
@@ -46,6 +46,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/hu/transmission.po b/applications/luci-app-transmission/po/hu/transmission.po
index 040f83802e..3cab990a65 100644
--- a/applications/luci-app-transmission/po/hu/transmission.po
+++ b/applications/luci-app-transmission/po/hu/transmission.po
@@ -61,6 +61,9 @@ msgstr "Puffer méret (MB)"
msgid "Config file directory"
msgstr "Beállítási fájl könyvtára"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT engedélyezve"
diff --git a/applications/luci-app-transmission/po/it/transmission.po b/applications/luci-app-transmission/po/it/transmission.po
index 1008fad277..52dce23b84 100644
--- a/applications/luci-app-transmission/po/it/transmission.po
+++ b/applications/luci-app-transmission/po/it/transmission.po
@@ -61,6 +61,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/ja/transmission.po b/applications/luci-app-transmission/po/ja/transmission.po
index dded65038a..502740bd05 100644
--- a/applications/luci-app-transmission/po/ja/transmission.po
+++ b/applications/luci-app-transmission/po/ja/transmission.po
@@ -61,6 +61,9 @@ msgstr "キャッシュサイズ (MB)"
msgid "Config file directory"
msgstr "コンフィグファイル・ディレクトリ"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHTを有効ã«ã™ã‚‹"
diff --git a/applications/luci-app-transmission/po/ms/transmission.po b/applications/luci-app-transmission/po/ms/transmission.po
index 3125fc2751..2b6f6247e0 100644
--- a/applications/luci-app-transmission/po/ms/transmission.po
+++ b/applications/luci-app-transmission/po/ms/transmission.po
@@ -46,6 +46,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/no/transmission.po b/applications/luci-app-transmission/po/no/transmission.po
index cb8684181c..5031ae312d 100644
--- a/applications/luci-app-transmission/po/no/transmission.po
+++ b/applications/luci-app-transmission/po/no/transmission.po
@@ -61,6 +61,9 @@ msgstr "Bufferstørrelse i MB"
msgid "Config file directory"
msgstr "Mappe for konfigurasjonsfil"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT aktivert"
diff --git a/applications/luci-app-transmission/po/pl/transmission.po b/applications/luci-app-transmission/po/pl/transmission.po
index f010d56da8..f0f19dc514 100644
--- a/applications/luci-app-transmission/po/pl/transmission.po
+++ b/applications/luci-app-transmission/po/pl/transmission.po
@@ -62,6 +62,9 @@ msgstr "Wielkość cache w MB"
msgid "Config file directory"
msgstr "Katalog z plikiem konfiguracyjnym"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT włączone"
diff --git a/applications/luci-app-transmission/po/pt-br/transmission.po b/applications/luci-app-transmission/po/pt-br/transmission.po
index 82ba6a46e4..8fe5073c63 100644
--- a/applications/luci-app-transmission/po/pt-br/transmission.po
+++ b/applications/luci-app-transmission/po/pt-br/transmission.po
@@ -61,6 +61,9 @@ msgstr "Tamanho em MB do cache"
msgid "Config file directory"
msgstr "Diretório dos arquivos de configuração"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT habilitado"
diff --git a/applications/luci-app-transmission/po/pt/transmission.po b/applications/luci-app-transmission/po/pt/transmission.po
index 512ca970dc..00604e2153 100644
--- a/applications/luci-app-transmission/po/pt/transmission.po
+++ b/applications/luci-app-transmission/po/pt/transmission.po
@@ -61,6 +61,9 @@ msgstr ""
msgid "Config file directory"
msgstr "Directório do ficheiro de configuração"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/ro/transmission.po b/applications/luci-app-transmission/po/ro/transmission.po
index 8e0fc7dcce..c99f64f36c 100644
--- a/applications/luci-app-transmission/po/ro/transmission.po
+++ b/applications/luci-app-transmission/po/ro/transmission.po
@@ -62,6 +62,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/ru/transmission.po b/applications/luci-app-transmission/po/ru/transmission.po
index 32edc4f51a..449177e1d9 100644
--- a/applications/luci-app-transmission/po/ru/transmission.po
+++ b/applications/luci-app-transmission/po/ru/transmission.po
@@ -63,6 +63,9 @@ msgstr "Размер кÑша в МБ"
msgid "Config file directory"
msgstr "Папка раÑположениÑ<br />Ñonfig файла"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT включен"
diff --git a/applications/luci-app-transmission/po/sk/transmission.po b/applications/luci-app-transmission/po/sk/transmission.po
index 4b4c3afd9a..787083ee1e 100644
--- a/applications/luci-app-transmission/po/sk/transmission.po
+++ b/applications/luci-app-transmission/po/sk/transmission.po
@@ -56,6 +56,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/sv/transmission.po b/applications/luci-app-transmission/po/sv/transmission.po
index 324bdab033..7cad76a542 100644
--- a/applications/luci-app-transmission/po/sv/transmission.po
+++ b/applications/luci-app-transmission/po/sv/transmission.po
@@ -57,6 +57,9 @@ msgstr "Storlek på cache i MB"
msgid "Config file directory"
msgstr "Ställ in fil-mapp"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "DHT aktiverat"
diff --git a/applications/luci-app-transmission/po/templates/transmission.pot b/applications/luci-app-transmission/po/templates/transmission.pot
index 5892abcad1..54658683f7 100644
--- a/applications/luci-app-transmission/po/templates/transmission.pot
+++ b/applications/luci-app-transmission/po/templates/transmission.pot
@@ -49,6 +49,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/tr/transmission.po b/applications/luci-app-transmission/po/tr/transmission.po
index 5a4df01496..e6f9fd5d63 100644
--- a/applications/luci-app-transmission/po/tr/transmission.po
+++ b/applications/luci-app-transmission/po/tr/transmission.po
@@ -56,6 +56,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/uk/transmission.po b/applications/luci-app-transmission/po/uk/transmission.po
index 1736934420..f3c01697f0 100644
--- a/applications/luci-app-transmission/po/uk/transmission.po
+++ b/applications/luci-app-transmission/po/uk/transmission.po
@@ -62,6 +62,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/vi/transmission.po b/applications/luci-app-transmission/po/vi/transmission.po
index 3125fc2751..2b6f6247e0 100644
--- a/applications/luci-app-transmission/po/vi/transmission.po
+++ b/applications/luci-app-transmission/po/vi/transmission.po
@@ -46,6 +46,9 @@ msgstr ""
msgid "Config file directory"
msgstr ""
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr ""
diff --git a/applications/luci-app-transmission/po/zh-cn/transmission.po b/applications/luci-app-transmission/po/zh-cn/transmission.po
index f4dba62591..81280cdcda 100644
--- a/applications/luci-app-transmission/po/zh-cn/transmission.po
+++ b/applications/luci-app-transmission/po/zh-cn/transmission.po
@@ -64,6 +64,9 @@ msgstr "缓存大å°ï¼ˆMB)"
msgid "Config file directory"
msgstr "é…置文件的目录"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "å¯ç”¨ DHT"
diff --git a/applications/luci-app-transmission/po/zh-tw/transmission.po b/applications/luci-app-transmission/po/zh-tw/transmission.po
index 304bfdad1e..6edf3b6d22 100644
--- a/applications/luci-app-transmission/po/zh-tw/transmission.po
+++ b/applications/luci-app-transmission/po/zh-tw/transmission.po
@@ -64,6 +64,9 @@ msgstr "å¿«å–大å°ï¼ˆMB)"
msgid "Config file directory"
msgstr "é…置檔案的目錄"
+msgid "Custom WEB UI directory"
+msgstr ""
+
msgid "DHT enabled"
msgstr "啟用 DHT"
diff --git a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
index 00969ffe7d..775831d9d0 100644
--- a/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
+++ b/applications/luci-app-travelmate/luasrc/controller/travelmate.lua
@@ -39,7 +39,7 @@ function trm_action(name)
if name == "do_restart" then
luci.sys.call("/etc/init.d/travelmate restart >/dev/null 2>&1")
end
- luci.http.prepare_content("text/plain")
+ luci.http.prepare_content("text/plain")
luci.http.write("0")
end
diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
index ab39dab6bd..a1a7ed72c3 100644
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -17,9 +17,10 @@ m = Map("travelmate", translate("Travelmate"),
.. "see online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/travelmate/files/README.md"))
m:chain("network")
m:chain("firewall")
+m.apply_on_parse = true
function m.on_apply(self)
- luci.sys.call("env -i /etc/init.d/travelmate restart >/dev/null 2>&1")
+ luci.sys.call("/etc/init.d/travelmate restart >/dev/null 2>&1")
end
-- Interface Wizard
diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm
index aba4a32018..272612600c 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm
@@ -7,7 +7,6 @@ This is free software, licensed under the Apache License, Version 2.0
.runtime
{
color: #37c;
- //#0069d6;
font-weight: bold;
display: inline-block;
width: 100%;
@@ -22,7 +21,7 @@ This is free software, licensed under the Apache License, Version 2.0
var btn1 = document.getElementById("btn1");
var view = document.getElementById("value_1");
var input = json.data.travelmate_status;
-
+
btn1.value = "<%:Restart%>";
btn1.name = "do_restart";
view.innerHTML = input || "-";
@@ -41,8 +40,6 @@ This is free software, licensed under the Apache License, Version 2.0
view = document.getElementById("value_6");
input = json.data.last_rundate;
view.innerHTML = input || "-";
- btn1.disabled = false;
- running(btn1_running, 0);
}
function btn_action(action)
@@ -60,6 +57,8 @@ This is free software, licensed under the Apache License, Version 2.0
{
return;
}
+ btn1.disabled = false;
+ running(btn1_running, 0);
});
}
@@ -139,7 +138,7 @@ This is free software, licensed under the Apache License, Version 2.0
<div class="cbi-value" id="button_1">
<label class="cbi-value-title" for="button_1"><%:Restart Travelmate%></label>
<div class="cbi-value-field">
- <input class="cbi-button cbi-button-reset" id="btn1" type="button" value="" onclick="btn_action(this)" />
+ <input class="cbi-button cbi-button-reset" id="btn1" type="button" name="do_restart" value="<%:Restart%>" onclick="btn_action(this)" />
<span id="btn1_running" style="display:inline-block; width:16px; height:16px; margin:0 5px"></span>
</div>
</div>
diff --git a/applications/luci-app-travelmate/po/ja/travelmate.po b/applications/luci-app-travelmate/po/ja/travelmate.po
index f1d1220b7c..f608a2aa9a 100644
--- a/applications/luci-app-travelmate/po/ja/travelmate.po
+++ b/applications/luci-app-travelmate/po/ja/travelmate.po
@@ -12,6 +12,9 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ja\n"
+msgid "Action"
+msgstr ""
+
msgid "Add Uplink"
msgstr "アップリンクã®è¿½åŠ "
@@ -122,6 +125,9 @@ msgstr "æš—å·åŒ–"
msgid "Extra options"
msgstr "拡張オプション"
+msgid "Faulty Stations"
+msgstr ""
+
msgid "Find and join network on"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®æ¤œç´¢ã¨å‚加:"
@@ -169,8 +175,11 @@ msgstr "インターフェース タイムアウト"
msgid "Interface Wizard"
msgstr "インターフェース ウィザード"
-msgid "Last rundate"
-msgstr "最終実行日時"
+msgid "Last Run"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
@@ -225,12 +234,8 @@ 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."
+"one. The currently used uplink is emphasized in blue, faulty stations in red."
msgstr ""
-"Travelmate 用インターフェース(%s)ã«è¨­å®šæ¸ˆã¿ã®å…¨ã‚¢ãƒƒãƒ—リンクã®ä¸€è¦§ã§ã™ã€‚既存"
-"ã®ã‚¢ãƒƒãƒ—リンクã®ç·¨é›†ã‚„削除ã€ä¸¦ã¹æ›¿ãˆã‚’è¡Œã£ãŸã‚Šã€ã‚¹ã‚­ãƒ£ãƒ³ã‚’è¡Œã£ã¦æ–°è¦ã‚¢ãƒƒãƒ—リ"
-"ンクを追加ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç¾åœ¨ä½¿ç”¨ã•ã‚Œã¦ã„るアップリンクã¯ã€é’色ã§å¼·èª¿ã•"
-"ã‚Œã¾ã™ã€‚"
msgid "QR-Codes"
msgstr "QR-コード"
@@ -241,6 +246,12 @@ msgstr "ç„¡ç·šã®é¸æŠž"
msgid "Repeat scan"
msgstr "å†ã‚¹ã‚­ãƒ£ãƒ³"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Travelmate"
+msgstr ""
+
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
msgstr "Travelmate ãŒæŒ‡å®šã•ã‚ŒãŸç„¡ç·šã«æŽ¥ç¶šã™ã‚‹ã‚ˆã†åˆ¶å¾¡ã—ã¾ã™ã€‚(例: 'radio0')"
@@ -268,21 +279,21 @@ msgstr "シグナルå“質閾値"
msgid "Signal strength"
msgstr "ä¿¡å·å¼·åº¦"
-msgid "Station ID (SSID/BSSID)"
-msgstr "ステーション ID (SSID / BSSID)"
+msgid "Station ID (RADIO/SSID/BSSID)"
+msgstr ""
msgid "Station Interface"
msgstr "ステーション インターフェース"
-msgid "Station Radio"
-msgstr "ステーション電波"
-
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
"BSSID 情報 '%s' ã¯ã‚ªãƒ—ションã§ã‚ã‚Šã€ã‚¹ãƒ†ãƒ«ã‚¹åŒ–ã•ã‚ŒãŸãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã®ã¿å¿…è¦ã§"
"ã™ã€‚"
+msgid "The syslog output, pre-filtered for travelmate related messages only."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the main firewall "
"configuration file (/etc/config/firewall)."
@@ -311,22 +322,12 @@ msgstr ""
"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã§ã¯ã€ç„¡ç·š 設定ファイル (/etc/config/wireless) ã®å†…容を変更ã™ã‚‹ã“"
"ã¨ãŒã§ãã¾ã™ã€‚"
-msgid ""
-"This form shows the syslog output, pre-filtered for travelmate related "
-"messages only."
-msgstr ""
-"ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã«ã¯ã€ã‚·ã‚¹ãƒ†ãƒ ãƒ­ã‚°å†…ã® Travelmate ã«é–¢ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã¿ãŒè¡¨ç¤ºã•"
-"ã‚Œã¾ã™ã€‚"
-
msgid "This step has only to be done once."
msgstr "ã“ã®æ‰‹é †ã¯ã€ä¸€åº¦ã ã‘実行ã•ã‚Œã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
msgid "Travelmate"
msgstr "Travelmate"
-msgid "Travelmate Logfile"
-msgstr "Travelmate ログファイル"
-
msgid "Travelmate Status (Quality)"
msgstr "Travelmate ステータス(å“質)"
@@ -381,14 +382,46 @@ msgstr "無線スキャン"
msgid "Wireless Stations"
msgstr "無線ステーション"
-msgid "add it to the wan zone of the firewall.<br />"
-msgstr "ファイアウォール㮠wan ゾーンã«è¿½åŠ ã—ã¾ã™ã€‚<br />"
+msgid "add it to the wan zone of the firewall."
+msgstr ""
msgid "hidden"
msgstr "(ステルス)"
-msgid "n/a"
-msgstr "利用ä¸å¯"
+#~ 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 "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 ""
+#~ "ã“ã®ãƒ•ã‚©ãƒ¼ãƒ ã«ã¯ã€ã‚·ã‚¹ãƒ†ãƒ ãƒ­ã‚°å†…ã® Travelmate ã«é–¢ã™ã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã¿ãŒè¡¨ç¤º"
+#~ "ã•ã‚Œã¾ã™ã€‚"
+
+#~ msgid "Travelmate Logfile"
+#~ msgstr "Travelmate ログファイル"
+
+#~ msgid "add it to the wan zone of the firewall.<br />"
+#~ msgstr "ファイアウォール㮠wan ゾーンã«è¿½åŠ ã—ã¾ã™ã€‚<br />"
+
+#~ msgid "n/a"
+#~ msgstr "利用ä¸å¯"
#~ msgid "Actions"
#~ msgstr "æ“作"
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index 2bed677d35..2655b7ca11 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -12,6 +12,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Language: pt_BR\n"
+msgid "Action"
+msgstr ""
+
msgid "Add Uplink"
msgstr ""
@@ -116,6 +119,9 @@ msgstr ""
msgid "Extra options"
msgstr "Opções adicionais"
+msgid "Faulty Stations"
+msgstr ""
+
msgid "Find and join network on"
msgstr ""
@@ -158,7 +164,10 @@ msgstr ""
msgid "Interface Wizard"
msgstr ""
-msgid "Last rundate"
+msgid "Last Run"
+msgstr ""
+
+msgid "Loading"
msgstr ""
msgid ""
@@ -212,7 +221,7 @@ 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."
+"one. The currently used uplink is emphasized in blue, faulty stations in red."
msgstr ""
msgid "QR-Codes"
@@ -224,6 +233,12 @@ msgstr ""
msgid "Repeat scan"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Travelmate"
+msgstr ""
+
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
msgstr ""
@@ -251,19 +266,19 @@ msgstr ""
msgid "Signal strength"
msgstr ""
-msgid "Station ID (SSID/BSSID)"
+msgid "Station ID (RADIO/SSID/BSSID)"
msgstr ""
msgid "Station Interface"
msgstr ""
-msgid "Station Radio"
-msgstr ""
-
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
+msgid "The syslog output, pre-filtered for travelmate related messages only."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the main firewall "
"configuration file (/etc/config/firewall)."
@@ -284,20 +299,12 @@ msgid ""
"configuration file (/etc/config/wireless)."
msgstr ""
-msgid ""
-"This form shows the syslog output, pre-filtered for travelmate related "
-"messages only."
-msgstr ""
-
msgid "This step has only to be done once."
msgstr ""
msgid "Travelmate"
msgstr "Travelmate"
-msgid "Travelmate Logfile"
-msgstr ""
-
msgid "Travelmate Status (Quality)"
msgstr ""
@@ -352,15 +359,12 @@ msgstr ""
msgid "Wireless Stations"
msgstr ""
-msgid "add it to the wan zone of the firewall.<br />"
+msgid "add it to the wan zone of the firewall."
msgstr ""
msgid "hidden"
msgstr ""
-msgid "n/a"
-msgstr ""
-
#~ msgid ""
#~ "Brief advice: Create a wwan interface, configure it to use dhcp and add "
#~ "it to the wan zone in firewall. Create the wifi interfaces to be used "
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index d3dbd24752..b97e76dd05 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -15,6 +15,9 @@ msgstr ""
"Project-Info: Это техничеÑкий перевод, не доÑловный. Главное-удобный руÑÑкий "
"интерфейÑ, вÑе проверÑлоÑÑŒ в графичеÑком режиме, ÑовмеÑтим Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ apps\n"
+msgid "Action"
+msgstr ""
+
msgid "Add Uplink"
msgstr "Подключение к Ñети"
@@ -121,6 +124,9 @@ msgstr "Шифрование"
msgid "Extra options"
msgstr "Дополнительные наÑтройки"
+msgid "Faulty Stations"
+msgstr ""
+
msgid "Find and join network on"
msgstr "Ðайти Ñеть Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸ÑпользуÑ"
@@ -165,8 +171,11 @@ msgstr "Ð’Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ° интерфейÑа"
msgid "Interface Wizard"
msgstr "Помощник наÑтройки интерфейÑа"
-msgid "Last rundate"
-msgstr "Дата поÑледнего запуÑка"
+msgid "Last Run"
+msgstr ""
+
+msgid "Loading"
+msgstr ""
msgid ""
"Minimum signal quality threshold as percent for conditional uplink (dis-) "
@@ -221,12 +230,8 @@ 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."
+"one. The currently used uplink is emphasized in blue, faulty stations in red."
msgstr ""
-"Общие ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð±Ð¾ вÑех наÑтроенных внешних Ñетевых ÑоединениÑÑ… интерфейÑа "
-"TravelMate (%s).<br />Ð’Ñ‹ можете редактировать, удалÑÑ‚ÑŒ или пере "
-"упорÑдочивать ÑущеÑтвующий ÑпиÑок внешних Ñетей или выполнÑÑ‚ÑŒ их поиÑк.<br /"
-">ИÑпользуемое Ñетевое Ñоединение выделено Ñиним цветом."
msgid "QR-Codes"
msgstr ""
@@ -237,6 +242,12 @@ msgstr "Выбор Wi-Fi уÑтройÑтва"
msgid "Repeat scan"
msgstr "Повторить поиÑк"
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Travelmate"
+msgstr ""
+
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
msgstr "Выделить TravelMate-у конкретное Wi-Fi уÑтройÑтво, например 'radio0'."
@@ -264,19 +275,19 @@ msgstr ""
msgid "Signal strength"
msgstr "МощноÑÑ‚ÑŒ Ñигнала"
-msgid "Station ID (SSID/BSSID)"
-msgstr "ID (SSID/BSSID) клиента"
+msgid "Station ID (RADIO/SSID/BSSID)"
+msgstr ""
msgid "Station Interface"
msgstr "Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°"
-msgid "Station Radio"
-msgstr "Wi-Fi уÑтройÑтво клиента"
-
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
+msgid "The syslog output, pre-filtered for travelmate related messages only."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the main firewall "
"configuration file (/etc/config/firewall)."
@@ -305,22 +316,12 @@ msgstr ""
"Страница наÑтройки беÑпроводных Ñоединений, изменение Ñодержимого config "
"файла wireless наÑтройки беÑпроводных Ñетей (/etc/config/wireless)."
-msgid ""
-"This form shows the syslog output, pre-filtered for travelmate related "
-"messages only."
-msgstr ""
-"Страница проÑмотра ÑиÑтемного журнала, показаны только ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ ÑвÑзанные Ñ "
-"работой утилиты TravelMate."
-
msgid "This step has only to be done once."
msgstr ""
msgid "Travelmate"
msgstr "TravelMate"
-msgid "Travelmate Logfile"
-msgstr "СиÑтемный журнал TravelMate"
-
msgid "Travelmate Status (Quality)"
msgstr ""
@@ -375,14 +376,43 @@ msgstr "Ðайденные точки доÑтупа Wi-Fi"
msgid "Wireless Stations"
msgstr "Клиенты беÑпроводной Ñети"
-msgid "add it to the wan zone of the firewall.<br />"
+msgid "add it to the wan zone of the firewall."
msgstr ""
msgid "hidden"
msgstr "Ñкрытый"
-msgid "n/a"
-msgstr "нет данных"
+#~ 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).<br />Ð’Ñ‹ можете редактировать, удалÑÑ‚ÑŒ или "
+#~ "пере упорÑдочивать ÑущеÑтвующий ÑпиÑок внешних Ñетей или выполнÑÑ‚ÑŒ их "
+#~ "поиÑк.<br />ИÑпользуемое Ñетевое Ñоединение выделено Ñиним цветом."
+
+#~ msgid "Station ID (SSID/BSSID)"
+#~ msgstr "ID (SSID/BSSID) клиента"
+
+#~ msgid "Station Radio"
+#~ msgstr "Wi-Fi уÑтройÑтво клиента"
+
+#~ msgid ""
+#~ "This form shows the syslog output, pre-filtered for travelmate related "
+#~ "messages only."
+#~ msgstr ""
+#~ "Страница проÑмотра ÑиÑтемного журнала, показаны только ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ ÑвÑзанные "
+#~ "Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð¾Ð¹ утилиты TravelMate."
+
+#~ msgid "Travelmate Logfile"
+#~ msgstr "СиÑтемный журнал TravelMate"
+
+#~ msgid "n/a"
+#~ msgstr "нет данных"
#~ msgid "Actions"
#~ msgstr "ДейÑтвиÑ"
diff --git a/applications/luci-app-travelmate/po/templates/travelmate.pot b/applications/luci-app-travelmate/po/templates/travelmate.pot
index b3e80e3c96..b8c235ff48 100644
--- a/applications/luci-app-travelmate/po/templates/travelmate.pot
+++ b/applications/luci-app-travelmate/po/templates/travelmate.pot
@@ -1,6 +1,9 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
+msgid "Action"
+msgstr ""
+
msgid "Add Uplink"
msgstr ""
@@ -105,6 +108,9 @@ msgstr ""
msgid "Extra options"
msgstr ""
+msgid "Faulty Stations"
+msgstr ""
+
msgid "Find and join network on"
msgstr ""
@@ -147,7 +153,10 @@ msgstr ""
msgid "Interface Wizard"
msgstr ""
-msgid "Last rundate"
+msgid "Last Run"
+msgstr ""
+
+msgid "Loading"
msgstr ""
msgid ""
@@ -201,7 +210,7 @@ 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."
+"one. The currently used uplink is emphasized in blue, faulty stations in red."
msgstr ""
msgid "QR-Codes"
@@ -213,6 +222,12 @@ msgstr ""
msgid "Repeat scan"
msgstr ""
+msgid "Restart"
+msgstr ""
+
+msgid "Restart Travelmate"
+msgstr ""
+
msgid "Restrict travelmate to a dedicated radio, e.g. 'radio0'."
msgstr ""
@@ -240,19 +255,19 @@ msgstr ""
msgid "Signal strength"
msgstr ""
-msgid "Station ID (SSID/BSSID)"
+msgid "Station ID (RADIO/SSID/BSSID)"
msgstr ""
msgid "Station Interface"
msgstr ""
-msgid "Station Radio"
-msgstr ""
-
msgid ""
"The BSSID information '%s' is optional and only required for hidden networks"
msgstr ""
+msgid "The syslog output, pre-filtered for travelmate related messages only."
+msgstr ""
+
msgid ""
"This form allows you to modify the content of the main firewall "
"configuration file (/etc/config/firewall)."
@@ -273,20 +288,12 @@ msgid ""
"configuration file (/etc/config/wireless)."
msgstr ""
-msgid ""
-"This form shows the syslog output, pre-filtered for travelmate related "
-"messages only."
-msgstr ""
-
msgid "This step has only to be done once."
msgstr ""
msgid "Travelmate"
msgstr ""
-msgid "Travelmate Logfile"
-msgstr ""
-
msgid "Travelmate Status (Quality)"
msgstr ""
@@ -341,11 +348,8 @@ msgstr ""
msgid "Wireless Stations"
msgstr ""
-msgid "add it to the wan zone of the firewall.<br />"
+msgid "add it to the wan zone of the firewall."
msgstr ""
msgid "hidden"
msgstr ""
-
-msgid "n/a"
-msgstr ""
diff --git a/applications/luci-app-unbound/luasrc/controller/unbound.lua b/applications/luci-app-unbound/luasrc/controller/unbound.lua
index ea3d26b919..734476acae 100644
--- a/applications/luci-app-unbound/luasrc/controller/unbound.lua
+++ b/applications/luci-app-unbound/luasrc/controller/unbound.lua
@@ -28,7 +28,8 @@ function index()
if (valman == "0") then
entry({"admin", "services", "unbound", "zones"},
- cbi("unbound/zones"), _("Zones"), 15)
+ arcombine(cbi("unbound/zones"), cbi("unbound/zone-details")),
+ _("Zones"), 15).leaf = true
end
@@ -51,6 +52,8 @@ function index()
entry({"admin", "services", "unbound", "status", "localzone"},
call("QueryLocalZone"), _("Local Zones"), 30).leaf = true
+ entry({"admin", "services", "unbound", "status", "dumpcache"},
+ call("QueryCacheDump"), _("Cache Dump"), 40).leaf = true
else
entry({"admin", "services", "unbound", "status", "statistics"},
call("ShowEmpty"), _("Statistics"), 10).leaf = true
@@ -106,7 +109,7 @@ end
function QuerySysLog()
- local lcldata = luci.util.exec("logread | grep -i unbound")
+ local lcldata = luci.util.exec("logread -e 'unbound'")
local lcldesc = luci.i18n.translate(
"This shows syslog filtered for events involving Unbound.")
@@ -150,6 +153,16 @@ function QueryLocalZone()
{heading = "", description = lcldesc, content = lcldata})
end
+function QueryCacheDump()
+ 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'. Usefull to check if unbound is actually caching dns entities.")
+
+ luci.template.render("unbound/show-textbox",
+ {heading = "", description = lcldesc, content = lcldata})
+end
function ShowUnboundConf()
local unboundfile = "/var/lib/unbound/unbound.conf"
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
index f665a2c9da..60d0477d53 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua
@@ -19,10 +19,12 @@ local ucl = luci.model.uci.cursor()
local valman = ucl:get_first("unbound", "unbound", "manual_conf")
m1 = Map("unbound")
-s1 = m1:section(TypedSection, "unbound", translate("DNS Resolver"),
+s1 = m1:section(TypedSection, "unbound", translate("Recursive DNS"),
translatef("Unbound <a href=\"%s\" target=\"_blank\">(NLnet Labs)</a>"
- .. " is a validating, recursive, and caching DNS resolver.",
- "https://www.unbound.net/"))
+ .. " is a validating, recursive, and caching DNS resolver"
+ .. " <a href=\"%s\" target=\"_blank\">(help)</a>.",
+ "https://www.unbound.net/",
+ "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md"))
s1.addremove = false
s1.anonymous = true
@@ -40,11 +42,11 @@ end
--Basic Tab, unconditional pieces
-ena = s1:taboption("basic", Flag, "enabled", translate("Enable Unbound:"),
+ena = s1:taboption("basic", Flag, "enabled", translate("Enable Unbound"),
translate("Enable the initialization scripts for Unbound"))
ena.rmempty = false
-mcf = s1:taboption("basic", Flag, "manual_conf", translate("Manual Conf:"),
+mcf = s1:taboption("basic", Flag, "manual_conf", translate("Manual Conf"),
translate("Skip UCI and use /etc/unbound/unbound.conf"))
mcf.rmempty = false
@@ -53,60 +55,60 @@ if (valman == "0") then
-- Not in manual configuration mode; show UCI
--Basic Tab
lsv = s1:taboption("basic", Flag, "localservice",
- translate("Local Service:"),
+ translate("Local Service"),
translate("Accept queries only from local subnets"))
lsv.rmempty = false
vld = s1:taboption("basic", Flag, "validator",
- translate("Enable DNSSEC:"),
+ translate("Enable DNSSEC"),
translate("Enable the DNSSEC validator module"))
vld.rmempty = false
nvd = s1:taboption("basic", Flag, "validator_ntp",
- translate("DNSSEC NTP Fix:"),
+ translate("DNSSEC NTP Fix"),
translate("Break the loop where DNSSEC needs NTP and NTP needs DNS"))
- nvd.rmempty = false
- nvd:depends({ validator = true })
+ nvd.optional = true
+ nvd:depends("validator", true)
prt = s1:taboption("basic", Value, "listen_port",
- translate("Listening Port:"),
+ translate("Listening Port"),
translate("Choose Unbounds listening port"))
prt.datatype = "port"
- prt.rmempty = false
+ prt.placeholder = "53"
--Avanced Tab
rlh = s1:taboption("advanced", Flag, "rebind_localhost",
- translate("Filter Localhost Rebind:"),
+ translate("Filter Localhost Rebind"),
translate("Protect against upstream response of 127.0.0.0/8"))
rlh.rmempty = false
rpv = s1:taboption("advanced", ListValue, "rebind_protection",
- translate("Filter Private Rebind:"),
+ translate("Filter Private Rebind"),
translate("Protect against upstream responses within local subnets"))
rpv:value("0", translate("No Filter"))
- rpv:value("1", translate("Filter RFC1918/4193"))
+ rpv:value("1", translate("Filter Private Address"))
rpv:value("2", translate("Filter Entire Subnet"))
rpv.rmempty = false
- d64 = s1:taboption("advanced", Flag, "dns64", translate("Enable DNS64:"),
+ d64 = s1:taboption("advanced", Flag, "dns64", translate("Enable DNS64"),
translate("Enable the DNS64 module"))
d64.rmempty = false
pfx = s1:taboption("advanced", Value, "dns64_prefix",
- translate("DNS64 Prefix:"),
+ translate("DNS64 Prefix"),
translate("Prefix for generated DNS64 addresses"))
pfx.datatype = "ip6addr"
pfx.placeholder = "64:ff9b::/96"
pfx.optional = true
- pfx:depends({ dns64 = true })
+ pfx:depends("dns64", true)
din = s1:taboption("advanced", DynamicList, "domain_insecure",
- translate("Domain Insecure:"),
+ translate("Domain Insecure"),
translate("List domains to bypass checks of DNSSEC"))
- din:depends({ validator = true })
+ din:depends("validator", true)
ag2 = s1:taboption("advanced", Value, "root_age",
- translate("Root DSKEY Age:"),
+ translate("Root DSKEY Age"),
translate("Limit days between RFC5011 copies to reduce flash writes"))
ag2.datatype = "and(uinteger,min(1),max(99))"
ag2:value("3", "3")
@@ -116,7 +118,7 @@ if (valman == "0") then
ag2:value("99", "99 ("..translate("never")..")")
tgr = s1:taboption("advanced", Value, "trigger_interface",
- translate("Trigger Networks:"),
+ translate("Trigger Networks"),
translate("Networks that may trigger Unbound to reload (avoid wan6)"))
tgr.template = "cbi/network_netlist"
tgr.widget = "checkbox"
@@ -126,7 +128,7 @@ if (valman == "0") then
--DHCP Tab
dlk = s1:taboption("DHCP", ListValue, "dhcp_link",
- translate("DHCP Link:"),
+ translate("DHCP Link"),
translate("Link to supported programs to load DHCP into DNS"))
dlk:value("none", translate("No Link"))
dlk:value("dnsmasq", "dnsmasq")
@@ -134,65 +136,70 @@ if (valman == "0") then
dlk.rmempty = false
dp6 = s1:taboption("DHCP", Flag, "dhcp4_slaac6",
- translate("DHCPv4 to SLAAC:"),
+ translate("DHCPv4 to SLAAC"),
translate("Use DHCPv4 MAC to discover IP6 hosts SLAAC (EUI64)"))
- dp6.rmempty = false
- dp6:depends({ dhcp_link = "odhcpd" })
+ dp6.optional = true
+ dp6:depends("dhcp_link", "odhcpd")
dom = s1:taboption("DHCP", Value, "domain",
- translate("Local Domain:"),
+ translate("Local Domain"),
translate("Domain suffix for this router and DHCP clients"))
dom.placeholder = "lan"
- dom:depends({ dhcp_link = "none" })
- dom:depends({ dhcp_link = "odhcpd" })
+ dom.optional = true
+ dom:depends("dhcp_link", "none")
+ dom:depends("dhcp_link", "odhcpd")
dty = s1:taboption("DHCP", ListValue, "domain_type",
- translate("Local Domain Type:"),
+ translate("Local Domain Type"),
translate("How to treat queries of this local domain"))
+ dty.optional = true
dty:value("deny", translate("Denied (nxdomain)"))
dty:value("refuse", translate("Refused"))
dty:value("static", translate("Static (local only)"))
dty:value("transparent", translate("Transparent (local/global)"))
- dty:depends({ dhcp_link = "none" })
- dty:depends({ dhcp_link = "odhcpd" })
+ dty:depends("dhcp_link", "none")
+ dty:depends("dhcp_link", "odhcpd")
lfq = s1:taboption("DHCP", ListValue, "add_local_fqdn",
- translate("LAN DNS:"),
+ translate("LAN DNS"),
translate("How to enter the LAN or local network router in DNS"))
+ lfq.optional = true
lfq:value("0", translate("No Entry"))
lfq:value("1", translate("Hostname, Primary Address"))
lfq:value("2", translate("Hostname, All Addresses"))
lfq:value("3", translate("Host FQDN, All Addresses"))
lfq:value("4", translate("Interface FQDN, All Addresses"))
- lfq:depends({ dhcp_link = "none" })
- lfq:depends({ dhcp_link = "odhcpd" })
+ lfq:depends("dhcp_link", "none")
+ lfq:depends("dhcp_link", "odhcpd")
wfq = s1:taboption("DHCP", ListValue, "add_wan_fqdn",
- translate("WAN DNS:"),
+ translate("WAN DNS"),
translate("Override the WAN side router entry in DNS"))
+ wfq.optional = true
wfq:value("0", translate("Use Upstream"))
wfq:value("1", translate("Hostname, Primary Address"))
wfq:value("2", translate("Hostname, All Addresses"))
wfq:value("3", translate("Host FQDN, All Addresses"))
wfq:value("4", translate("Interface FQDN, All Addresses"))
- wfq:depends({ dhcp_link = "none" })
- wfq:depends({ dhcp_link = "odhcpd" })
+ wfq:depends("dhcp_link", "none")
+ wfq:depends("dhcp_link", "odhcpd")
exa = s1:taboption("DHCP", ListValue, "add_extra_dns",
- translate("Extra DNS:"),
+ translate("Extra DNS"),
translate("Use extra DNS entries found in /etc/config/dhcp"))
+ exa.optional = true
exa:value("0", translate("Ignore"))
exa:value("1", translate("Host Records"))
exa:value("2", translate("Host/MX/SRV RR"))
exa:value("3", translate("Host/MX/SRV/CNAME RR"))
- exa:depends({ dhcp_link = "none" })
- exa:depends({ dhcp_link = "odhcpd" })
+ exa:depends("dhcp_link", "none")
+ exa:depends("dhcp_link", "odhcpd")
--TODO: dnsmasq needs to not reference resolve-file and get off port 53.
--Resource Tuning Tab
ctl = s1:taboption("resource", ListValue, "unbound_control",
- translate("Unbound Control App:"),
+ translate("Unbound Control App"),
translate("Enable access for unbound-control"))
ctl.rmempty = false
ctl:value("0", translate("No Remote Control"))
@@ -202,17 +209,18 @@ if (valman == "0") then
ctl:value("4", translate("Local Subnet, Static Encryption"))
pro = s1:taboption("resource", ListValue, "protocol",
- translate("Recursion Protocol:"),
- translate("Chose the protocol recursion queries leave on"))
+ translate("Recursion Protocol"),
+ translate("Chose the IP versions used upstream and downstream"))
pro:value("default", translate("Default"))
pro:value("ip4_only", translate("IP4 Only"))
- pro:value("ip6_only", translate("IP6 Only"))
+ pro:value("ip6_local", translate("IP4 All and IP6 Local"))
+ pro:value("ip6_only", translate("IP6 Only*"))
pro:value("ip6_prefer", translate("IP6 Preferred"))
pro:value("mixed", translate("IP4 and IP6"))
pro.rmempty = false
rsc = s1:taboption("resource", ListValue, "resource",
- translate("Memory Resource:"),
+ translate("Memory Resource"),
translate("Use menu System/Processes to observe any memory growth"))
rsc:value("default", translate("Default"))
rsc:value("tiny", translate("Tiny"))
@@ -222,7 +230,7 @@ if (valman == "0") then
rsc.rmempty = false
rsn = s1:taboption("resource", ListValue, "recursion",
- translate("Recursion Strength:"),
+ translate("Recursion Strength"),
translate("Recursion activity affects memory growth and CPU load"))
rsn:value("default", translate("Default"))
rsn:value("passive", translate("Passive"))
@@ -230,38 +238,38 @@ if (valman == "0") then
rsn.rmempty = false
qry = s1:taboption("resource", Flag, "query_minimize",
- translate("Query Minimize:"),
+ translate("Query Minimize"),
translate("Break down query components for limited added privacy"))
- qry.rmempty = false
- qry:depends({ recursion = "passive" })
- qry:depends({ recursion = "aggressive" })
+ qry.optional = true
+ qry:depends("recursion", "passive")
+ qry:depends("recursion", "aggressive")
qrs = s1:taboption("resource", Flag, "query_min_strict",
- translate("Strict Minimize:"),
+ translate("Strict Minimize"),
translate("Strict version of 'query minimize' but it can break DNS"))
- qrs.rmempty = false
- qrs:depends({ query_minimize = true })
+ qrs.optional = true
+ qrs:depends("query_minimize", true)
eds = s1:taboption("resource", Value, "edns_size",
- translate("EDNS Size:"),
+ translate("EDNS Size"),
translate("Limit extended DNS packet size"))
eds.datatype = "and(uinteger,min(512),max(4096))"
- eds.rmempty = false
+ eds.placeholder = "1280"
tlm = s1:taboption("resource", Value, "ttl_min",
- translate("TTL Minimum:"),
+ translate("TTL Minimum"),
translate("Prevent excessively short cache periods"))
- tlm.datatype = "and(uinteger,min(0),max(600))"
- tlm.rmempty = false
+ tlm.datatype = "and(uinteger,min(0),max(1200))"
+ tlm.placeholder = "120"
stt = s1:taboption("resource", Flag, "extended_stats",
- translate("Extended Statistics:"),
+ translate("Extended Statistics"),
translate("Extended statistics are printed from unbound-control"))
stt.rmempty = false
else
ag2 = s1:taboption("basic", Value, "root_age",
- translate("Root DSKEY Age:"),
+ translate("Root DSKEY Age"),
translate("Limit days between RFC5011 copies to reduce flash writes"))
ag2.datatype = "and(uinteger,min(1),max(99))"
ag2:value("3", "3")
@@ -271,7 +279,7 @@ else
ag2:value("99", "99 ("..translate("never")..")")
tgr = s1:taboption("basic", Value, "trigger_interface",
- translate("Trigger Networks:"),
+ translate("Trigger Networks"),
translate("Networks that may trigger Unbound to reload (avoid wan6)"))
tgr.template = "cbi/network_netlist"
tgr.widget = "checkbox"
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua
index 3aef189652..f1e1d842a1 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua
@@ -12,7 +12,7 @@ m6.submit = translate("Save")
m6.reset = false
s6 = m6:section(SimpleSection, "",
translatef("Edit '" .. filename .. "' "
- .. "and help can be found in OpenWrt "
+ .. "and recipes can be found in OpenWrt "
.. "<a href=\"%s\" target=\"_blank\">Guides</a> "
.. "and <a href=\"%s\" target=\"_blank\">Github</a>.",
"https://openwrt.org/docs/guide-user/services/dns/unbound",
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua
new file mode 100644
index 0000000000..dcaa877fd0
--- /dev/null
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua
@@ -0,0 +1,95 @@
+-- Copyright 2018 Eric Luehrsen <ericluehrsen@gmail.com>
+-- Licensed to the public under the Apache License 2.0.
+
+local sy = require "luci.sys"
+local ds = require "luci.dispatcher"
+local hp = require "luci.http"
+local m7, s7
+local ena, flb, zty, znm, srv, rlv, tlu
+local prt, tlp, tli, url
+
+arg[1] = arg[1] or ""
+m7 = Map("unbound")
+m7.redirect = ds.build_url("admin/services/unbound/zones")
+
+
+if (arg[1] == "") then
+ hp.redirect(m7.redirect)
+ return
+
+else
+ s7 = m7:section(NamedSection, arg[1], "zone",
+ translatef("Directed Zone"),
+ translatef("Edit a forward, stub, or zone-file-cache zone "
+ .. "for Unbound to use instead of recursion."))
+
+ s7.anonymous = true
+ s7.addremove = false
+
+ ena = s7:option(Flag, "enabled", translate("Enabled"),
+ translate("Enable this directed zone"))
+ ena.rmempty = false
+
+ flb = s7:option(Flag, "fallback", translate("Fall Back"),
+ translate("Allow open recursion when record not in zone"))
+ flb.rmempty = false
+
+ zty = s7:option(ListValue, "zone_type", translate("Zone Type"))
+ zty:value("auth_zone", translate("Authoritative (zone file)"))
+ zty:value("stub_zone", translate("Stub (forced recursion)"))
+ zty:value("forward_zone", translate("Forward (simple handoff)"))
+ zty.rmempty = false
+
+ znm = s7:option(DynamicList, "zone_name", translate("Zone Names"),
+ translate("Zone (Domain) names included in this zone combination"))
+ znm.placeholder="new.example.net."
+
+ srv = s7:option(DynamicList, "server", translate("Servers"),
+ translate("Servers for this zone; see README.md for optional form"))
+ srv.placeholder="192.0.2.53"
+
+ rlv = s7:option(Flag, "resolv_conf", translate("Use 'resolv.conf.auto'"),
+ translate("Forward to upstream nameservers (ISP)"))
+ rlv:depends("zone_type", "forward_zone")
+
+ tlu = s7:option(Flag, "tls_upstream", translate("DNS over TLS"),
+ translate("Connect to servers using TLS"))
+ tlu:depends("zone_type", "forward_zone")
+
+ prt = s7:option(Value, "port", translate("Server Port"),
+ translate("Port servers will receive queries on"))
+ prt:depends("tls_upstream", false)
+ prt.datatype = "port"
+ prt.placeholder="53"
+
+ tlp = s7:option(Value, "tls_port", translate("Server TLS Port"),
+ translate("Port servers will receive queries on"))
+ tlp:depends("tls_upstream", true)
+ tlp.datatype = "port"
+ tlp.placeholder="853"
+
+ tli = s7:option(Value, "tls_index", translate("TLS Name Index"),
+ translate("Domain name to verify TLS certificate"))
+ tli:depends("tls_upstream", true)
+ tli.placeholder="dns.example.net"
+
+ url = s7:option(Value, "url_dir", translate("Zone Download URL"),
+ translate("Directory only part of URL"))
+ url:depends("zone_type", "auth_zone")
+ url.placeholder="https://www.example.net/dl/zones/"
+end
+
+
+function m7.on_commit(self)
+ if sy.init.enabled("unbound") then
+ -- Restart Unbound with configuration
+ sy.call("/etc/init.d/unbound restart >/dev/null 2>&1")
+
+ else
+ sy.call("/etc/init.d/unbound stop >/dev/null 2>&1")
+ end
+end
+
+
+return m7
+
diff --git a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua
index bbc0e2335f..798ca6a45c 100644
--- a/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua
+++ b/applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua
@@ -1,4 +1,4 @@
--- Copyright 2017 Eric Luehrsen <ericluehrsen@gmail.com>
+-- Copyright 2018 Eric Luehrsen <ericluehrsen@gmail.com>
-- Licensed to the public under the Apache License 2.0.
local m5, s5
@@ -7,18 +7,22 @@ local ztype, zones, servers, fallback, enabled
local fs = require "nixio.fs"
local ut = require "luci.util"
local sy = require "luci.sys"
+local ds = require "luci.dispatcher"
local resolvfile = "/tmp/resolv.conf.auto"
+local logerr = ut.exec("logread -e 'unbound.*error.*ssl library'")
m5 = Map("unbound")
s5 = m5:section(TypedSection, "zone", "Zones",
- translatef("This shows extended zones and more details can be "
- .. "changed in Files tab and <a href=\"%s\">Edit:UCI</a> subtab.",
- "/cgi-bin/luci/admin/services/unbound/files" ))
+ translatef("Organize directed forward, stub, and authoritative zones"
+ .. " <a href=\"%s\" target=\"_blank\">(help)</a>.",
+ "https://www.unbound.net/",
+ "https://github.com/openwrt/packages/blob/master/net/unbound/files/README.md"))
-s5.addremove = false
+s5.addremove = true
s5.anonymous = true
s5.sortable = true
s5.template = "cbi/tblsection"
+s5.extedit = ds.build_url("admin/services/unbound/zones/%s")
ztype = s5:option(DummyValue, "DummyType", translate("Type"))
ztype.rawhtml = true
@@ -36,6 +40,23 @@ enabled = s5:option(Flag, "enabled", translate("Enable"))
enabled.rmempty = false
+if logerr and (#logerr > 0) then
+ logerr = logerr:sub((1 + #logerr - math.min(#logerr, 250)), #logerr)
+ m5.message = translatef( "Note: SSL/TLS library is missing an API. "
+ .. "Please review syslog. >> logread ... " .. logerr )
+end
+
+
+function s5.create(self, section)
+ created = TypedSection.create(self, section)
+end
+
+
+function s5.parse(self, ...)
+ TypedSection.parse(self, ...)
+end
+
+
function ztype.cfgvalue(self, s)
-- Format a meaninful tile for the Zone Type column
local itxt = self.map:get(s, "zone_type")
@@ -57,7 +78,7 @@ function ztype.cfgvalue(self, s)
return translate("AXFR")
else
- return translate("Error")
+ return translate("Undefined")
end
end
@@ -85,22 +106,22 @@ function zones.cfgvalue(self, s)
end
- if itype and itype:match("forward") then
- -- from zone_type create a readable hint for the action
- otxt = translate("accept upstream results for ") .. otxt
+ if otxt and (#otxt > 0) then
+ if itype and itype:match("forward") then
+ -- from zone_type create a readable hint for the action
+ otxt = translate("accept upstream results for ") .. otxt
- elseif itype and itype:match("stub") then
- otxt = translate("select recursion for ") .. otxt
+ elseif itype and itype:match("stub") then
+ otxt = translate("select recursion for ") .. otxt
- elseif itype and itype:match("auth") then
- otxt = translate("prefetch zone files for ") .. otxt
+ elseif itype and itype:match("auth") then
+ otxt = translate("prefetch zone files for ") .. otxt
- else
- otxt = translate("unknown action for ") .. otxt
- end
+ else
+ otxt = translate("unknown action for ") .. otxt
+ end
- if otxt and (#otxt > 0) then
return otxt
else
@@ -131,14 +152,17 @@ function servers.cfgvalue(self, s)
end
+ if otxt and (#otxt > 0) then
+ otxt = translate("use nameservers ") .. otxt
+ end
+
+
if otxt and (#otxt > 0)
and itls and (itls == "1")
and iidx and (#iidx > 0) then
-- show TLS certificate name index if provided
- otxt = translatef("use nameservers by <var>%s</var> at ", iidx) .. otxt
-
- elseif otxt and (#otxt > 0) then
- otxt = translate("use nameservers ") .. otxt
+ otxt = otxt .. translatef(
+ " with default certificate for <var>%s</var>", iidx)
end
@@ -174,11 +198,12 @@ function servers.cfgvalue(self, s)
if otxt and (#otxt > 0) and rtxt and (#rtxt > 0) then
- otxt = otxt
- .. translatef(", and <var>%s</var> entries ", resolvfile) .. rtxt
+ otxt = otxt .. translatef(
+ ", and <var>%s</var> entries ", resolvfile) .. rtxt
elseif rtxt and (#rtxt > 0) then
- otxt = translatef("use <var>%s</var> nameservers ", resolvfile) .. rtxt
+ otxt = translatef(
+ "use <var>%s</var> nameservers ", resolvfile) .. rtxt
end
end
diff --git a/applications/luci-app-upnp/po/zh-cn/upnp.po b/applications/luci-app-upnp/po/zh-cn/upnp.po
index e2e5ea12de..69dfaec7c3 100644
--- a/applications/luci-app-upnp/po/zh-cn/upnp.po
+++ b/applications/luci-app-upnp/po/zh-cn/upnp.po
@@ -1,17 +1,20 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2012-09-03 18:02+0200\n"
-"Last-Translator: nKsyn <e.nksyn@gmail.com>\n"
-"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"PO-Revision-Date: 2018-08-07 20:18+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid ""
"ACLs specify which external ports may be redirected to which internal "
@@ -28,7 +31,7 @@ msgid "Advanced Settings"
msgstr "高级设置"
msgid "Advertise as IGDv1 device instead of IGDv2"
-msgstr ""
+msgstr "广播为 IGDv1 设备,而ä¸æ˜¯ IGDv2"
msgid "Allow adding forwards only to requesting ip addresses"
msgstr "å…许åªå‘请求的 IP 地å€æ·»åŠ è½¬å‘"
@@ -52,7 +55,7 @@ msgid "Client Port"
msgstr "客户端端å£"
msgid "Collecting data..."
-msgstr "正在收集数æ®..."
+msgstr "正在收集数æ®â€¦"
msgid "Comment"
msgstr "备注"
@@ -70,7 +73,7 @@ msgid "Downlink"
msgstr "下行速率"
msgid "Enable IGDv1 mode"
-msgstr ""
+msgstr "å¯ç”¨ IGDv1 模å¼"
msgid "Enable NAT-PMP functionality"
msgstr "å¯ç”¨ NAT-PMP 功能"
@@ -94,7 +97,7 @@ msgid "General Settings"
msgstr "基本设置"
msgid "Host"
-msgstr ""
+msgstr "主机"
msgid "Internal addresses"
msgstr "内部地å€"
@@ -103,7 +106,7 @@ msgid "Internal ports"
msgstr "内部端å£"
msgid "MiniUPnP ACLs"
-msgstr "MiniUPnP çš„ ACL"
+msgstr "MiniUPnP ACL"
msgid "MiniUPnP settings"
msgstr "MiniUPnP 设置"
@@ -121,7 +124,7 @@ msgid "Protocol"
msgstr "åè®®"
msgid "Puts extra debugging information into the system log"
-msgstr "æå–é¢å¤–的调试信æ¯è‡³ç³»ç»Ÿæ—¥å¿—"
+msgstr "å°†é¢å¤–的调试信æ¯æ‰“å°è‡³ç³»ç»Ÿæ—¥å¿—中"
msgid "Report system instead of daemon uptime"
msgstr "用系统è¿è¡Œæ—¶é—´ä»£æ›¿è¿›ç¨‹è¿è¡Œæ—¶é—´"
@@ -147,7 +150,7 @@ msgid "Universal Plug & Play"
msgstr "通用å³æ’å³ç”¨ï¼ˆUPnP)"
msgid "Unknown"
-msgstr ""
+msgstr "未知"
msgid "Uplink"
msgstr "上行速率"
diff --git a/applications/luci-app-upnp/po/zh-tw/upnp.po b/applications/luci-app-upnp/po/zh-tw/upnp.po
index fdbae80093..9f6487e1c2 100644
--- a/applications/luci-app-upnp/po/zh-tw/upnp.po
+++ b/applications/luci-app-upnp/po/zh-tw/upnp.po
@@ -1,15 +1,18 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-14 11:40+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 20:18+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid ""
"ACLs specify which external ports may be redirected to which internal "
@@ -92,7 +95,7 @@ msgid "General Settings"
msgstr "一般設定"
msgid "Host"
-msgstr ""
+msgstr "主機"
msgid "Internal addresses"
msgstr "內部ä½å€"
@@ -131,7 +134,7 @@ msgid "There are no active redirects."
msgstr "ç›®å‰ç„¡ä½œç”¨ä¸­çš„從導"
msgid "UPnP"
-msgstr "UPNP通用åºåˆ—埠å”定"
+msgstr "UPnP"
msgid ""
"UPnP allows clients in the local network to automatically configure the "
@@ -139,19 +142,19 @@ msgid ""
msgstr "開放本地用戶端自動設定路由器UPNP機制"
msgid "UPnP lease file"
-msgstr "UPnP租賃文件"
+msgstr "UPnP 租賃文件"
msgid "Universal Plug & Play"
-msgstr "通用åºåˆ—埠隨æ’隨用"
+msgstr "通用隨æ’å³ç”¨ï¼ˆUPnP)"
msgid "Unknown"
-msgstr ""
+msgstr "未知"
msgid "Uplink"
-msgstr "上傳"
+msgstr "上行速率"
msgid "Value in KByte/s, informational only"
-msgstr "僅採用 KByte/s值單ä½è¡¨ç¤º"
+msgstr "值為 KByte/s,僅供åƒè€ƒ"
#~ msgid "Delete Redirect"
#~ msgstr "刪除從導"
diff --git a/applications/luci-app-vnstat/po/zh-cn/vnstat.po b/applications/luci-app-vnstat/po/zh-cn/vnstat.po
index 68e4905f05..d46f858ee2 100644
--- a/applications/luci-app-vnstat/po/zh-cn/vnstat.po
+++ b/applications/luci-app-vnstat/po/zh-cn/vnstat.po
@@ -1,41 +1,44 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-10-08 14:05+0200\n"
-"Last-Translator: Tanyingyu <Tanyingyu@163.com>\n"
-"Language-Team: German\n"
+"PO-Revision-Date: 2018-08-07 20:49+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Configuration"
msgstr "é…ç½®"
msgid "Daily traffic"
-msgstr "æµé‡æ—¥æŠ¥"
+msgstr "æ¯æ—¥æµé‡"
msgid "Graphs"
msgstr "图表"
msgid "Hourly traffic"
-msgstr "æµé‡æ—¶æŠ¥"
+msgstr "æ¯å°æ™‚æµé‡"
msgid "Monitor selected interfaces"
msgstr "监控选择的接å£"
msgid "Monthly traffic"
-msgstr "æµé‡æœˆæŠ¥"
+msgstr "æ¯æœˆæµé‡"
msgid ""
"No database has been set up yet. Go to the VnStat configuration and enable "
"monitoring for one or more interfaces."
-msgstr "没有创建统计数æ®ã€‚ 去VnStaté…置,并å¯åŠ¨ç›‘控一个或多个接å£ã€‚"
+msgstr "尚未设置数æ®åº“。å‰å¾€ VnStat 进行é…置,并å¯åŠ¨ç›‘控一个或多个接å£ã€‚"
msgid "Restart VnStat"
-msgstr "é‡ç½®VnStat"
+msgstr "é‡å¯ VnStat"
msgid "Summary display"
msgstr "摘è¦æ˜¾ç¤º"
@@ -44,18 +47,18 @@ msgid "Top 10 display"
msgstr "显示å‰10"
msgid "Update »"
-msgstr "æ›´æ–°"
+msgstr "更新 »"
msgid "VnStat"
msgstr "VnStat"
msgid "VnStat Graphs"
-msgstr "VnStat图表"
+msgstr "VnStat 图表"
msgid "VnStat Traffic Monitor"
-msgstr "VNStatæµé‡ç›‘控"
+msgstr "VNStat æµé‡ç›‘控"
msgid ""
"VnStat is a network traffic monitor for Linux that keeps a log of network "
"traffic for the selected interface(s)."
-msgstr "vnstat是一个网络æµé‡ç›‘控器,用于Linuxä¿ç•™æ‰€é€‰æŽ¥å£çš„网络æµé‡æ—¥å¿—。"
+msgstr "VnStat 是一个 Linux 网络æµé‡ç›‘控器,用于ä¿å­˜æ‰€é€‰æŽ¥å£çš„网络æµé‡æ—¥å¿—。"
diff --git a/applications/luci-app-vnstat/po/zh-tw/vnstat.po b/applications/luci-app-vnstat/po/zh-tw/vnstat.po
index 261747aad2..7af1923d78 100644
--- a/applications/luci-app-vnstat/po/zh-tw/vnstat.po
+++ b/applications/luci-app-vnstat/po/zh-tw/vnstat.po
@@ -1,15 +1,18 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-14 10:52+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 20:49+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Configuration"
msgstr "設定"
@@ -32,30 +35,30 @@ msgstr "æ¯æœˆæµé‡"
msgid ""
"No database has been set up yet. Go to the VnStat configuration and enable "
"monitoring for one or more interfaces."
-msgstr "尚無任何資料庫被設定. 進入VnStaté‡å°æŸä¸€å€‹æˆ–多個介é¢è¨­å®šä¸¦å•Ÿç”¨ç›£è¦–."
+msgstr "尚未設定資料庫。å‰å¾€ VnStat 進行é…置,並啟動監控一個或多個介é¢ã€‚"
msgid "Restart VnStat"
-msgstr "從新啟動 VnStat"
+msgstr "é‡å•Ÿ VnStat"
msgid "Summary display"
msgstr "顯示概è¦"
msgid "Top 10 display"
-msgstr "顯示å‰10å"
+msgstr "顯示å‰10"
msgid "Update »"
-msgstr "æ›´æ–°"
+msgstr "更新 »"
msgid "VnStat"
msgstr "VnStat"
msgid "VnStat Graphs"
-msgstr "VnStat圖表"
+msgstr "VnStat 圖表"
msgid "VnStat Traffic Monitor"
-msgstr "VnStatæµé‡ç›£è¦–"
+msgstr "VNStat æµé‡ç›£è¦–"
msgid ""
"VnStat is a network traffic monitor for Linux that keeps a log of network "
"traffic for the selected interface(s)."
-msgstr " VnStat是一個é‡å°Linux上的網路æµé‡ç›£è¦–å¯é”到ä¿å­˜ç‰¹å®šä»‹é¢çš„æµé‡ç´€éŒ„"
+msgstr "VnStat 是一個 Linux 網路æµé‡ç›£è¦–器,用於ä¿å­˜æ‰€é¸ä»‹é¢çš„網路æµé‡æ—¥èªŒã€‚"
diff --git a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
index 72c55a6c81..9b8ab00a62 100644
--- a/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/zh-cn/vpnbypass.po
@@ -1,5 +1,5 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
@@ -8,7 +8,7 @@ msgstr ""
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"PO-Revision-Date: 2017-10-29 15:30+0800\n"
+"PO-Revision-Date: 2018-08-07 20:19+0800\n"
"X-Generator: Gtranslator 2.91.7\n"
msgid "Domains to Bypass"
@@ -49,7 +49,7 @@ msgid "Remote ports to trigger VPN Bypass"
msgstr "è§¦å‘ VPN 绕过的远程端å£"
msgid "Start VPNBypass service"
-msgstr ""
+msgstr "å¯åŠ¨ VPNBypass æœåŠ¡"
msgid "VPN Bypass"
msgstr "VPN 绕过"
diff --git a/applications/luci-app-watchcat/po/zh-cn/watchcat.po b/applications/luci-app-watchcat/po/zh-cn/watchcat.po
index fc9f7d6286..5efc1373b4 100644
--- a/applications/luci-app-watchcat/po/zh-cn/watchcat.po
+++ b/applications/luci-app-watchcat/po/zh-cn/watchcat.po
@@ -1,28 +1,31 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2012-09-24 18:18+0200\n"
-"Last-Translator: shanliren <shanliren.net@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 20:22+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Forced reboot delay"
msgstr "强制é‡å¯å»¶æ—¶"
msgid "Host address to ping"
-msgstr "ping主机地å€"
+msgstr "è¦ ping 的主机地å€"
msgid ""
"How often to check internet connection. Default unit is seconds, you can you "
"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
msgstr ""
-"检测网络连接的频率。默认å•ä½ä¸ºç§’,您å¯ä»¥ä½¿ç”¨'m'作为åŽç¼€è¡¨ç¤ºåˆ†é’Ÿï¼Œâ€˜h’表示å°"
-"时‘d’表示天。"
+"检测网络连接的频率。默认å•ä½ä¸ºç§’,您å¯ä»¥ä½¿ç”¨â€œmâ€ä½œä¸ºåŽç¼€è¡¨ç¤ºåˆ†é’Ÿï¼Œâ€œhâ€è¡¨ç¤ºå°"
+"时,“dâ€è¡¨ç¤ºå¤©ã€‚"
msgid ""
"In periodic mode, it defines the reboot period. In internet mode, it defines "
@@ -30,9 +33,9 @@ msgid ""
"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
"for hours or 'd' for days"
msgstr ""
-"在周期模å¼ï¼Œæ­¤å¤„定义了é‡å¯çš„周期。在è”网模å¼ï¼Œè¿™ä¸ªè¡¨ç¤ºæ²¡æœ‰ç½‘络连接情况下到执"
-"è¡Œé‡å¯çš„最长时间间隔。默认å•ä½ä¸ºç§’,您å¯ä»¥ä½¿ç”¨'m'作为åŽç¼€è¡¨ç¤ºåˆ†é’Ÿï¼Œâ€˜h’表示å°"
-"时‘d’表示天。"
+"在周期模å¼ä¸‹ï¼Œæ­¤å¤„定义了é‡å¯çš„周期。在è”网模å¼ä¸‹ï¼Œè¿™ä¸ªè¡¨ç¤ºæ²¡æœ‰ç½‘络连接情况下"
+"到执行é‡å¯çš„最长时间间隔。默认å•ä½ä¸ºç§’,您å¯ä»¥ä½¿ç”¨â€œmâ€ä½œä¸ºåŽç¼€è¡¨ç¤ºåˆ†é’Ÿï¼Œâ€œhâ€è¡¨"
+"示å°æ—¶ï¼Œâ€œdâ€è¡¨ç¤ºå¤©ã€‚"
msgid "Operating mode"
msgstr "æ“作模å¼"
@@ -41,25 +44,23 @@ msgid "Period"
msgstr "周期"
msgid "Ping host"
-msgstr "ping主机"
+msgstr "Ping 主机"
msgid "Ping period"
-msgstr "ping周期"
+msgstr "Ping 周期"
msgid "Watchcat"
-msgstr "WatchCat"
+msgstr "Watchcat"
-#, fuzzy
msgid ""
"Watchcat allows configuring a periodic reboot when the Internet connection "
"has been lost for a certain period of time."
-msgstr "WatchCatå…许设置周期性的é‡å¯ å’Œ/或者 当网络连接断开达规定时间。"
+msgstr "Watchcat å…许在网络连接丢失一段时间åŽé…置定时é‡å¯åŠ¨ã€‚"
-#, fuzzy
msgid ""
"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
"a non zero value here will trigger a delayed hard reboot if the soft reboot "
"fails. Enter a number of seconds to enable, use 0 to disable"
msgstr ""
-"当é‡å¯ç³»ç»Ÿçš„时候WatchCat将会触å‘一个软é‡å¯ï¼Œåœ¨è¿™é‡Œè¾“入一个éž0的值,如果软é‡å¯"
-"失败将会触å‘一个延迟的硬é‡å¯ã€‚输入秒数å¯ç”¨ï¼Œè¾“å…¥0ç¦æ­¢åŠŸèƒ½ã€‚"
+"当é‡å¯ç³»ç»Ÿæ—¶ï¼ŒWatchCat 将触å‘一个软é‡å¯ã€‚åœ¨æ­¤è¾“å…¥ä¸€ä¸ªéž 0 值,如果软é‡å¯å¤±è´¥"
+"将会触å‘一个延迟的硬é‡å¯ã€‚输入秒数å¯ç”¨ï¼Œè¾“å…¥ 0 ç¦ç”¨"
diff --git a/applications/luci-app-watchcat/po/zh-tw/watchcat.po b/applications/luci-app-watchcat/po/zh-tw/watchcat.po
index b4e52bbf41..7528735b8b 100644
--- a/applications/luci-app-watchcat/po/zh-tw/watchcat.po
+++ b/applications/luci-app-watchcat/po/zh-tw/watchcat.po
@@ -1,28 +1,31 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2014-05-14 12:00+0200\n"
-"Last-Translator: omnistack <omnistack@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2018-08-07 20:22+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"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Pootle 2.0.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "Forced reboot delay"
-msgstr "強制é‡å•Ÿå»¶é²"
+msgstr "強制é‡å•Ÿå»¶æ™‚"
msgid "Host address to ping"
-msgstr "è¦Ping的主機ä½å€"
+msgstr "è¦ ping 的主機ä½å€"
msgid ""
"How often to check internet connection. Default unit is seconds, you can you "
"use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
msgstr ""
-"多久檢查一次網際網路連線. é è¨­å–®ä½å€¼æ˜¯ç§’, å¯ä»¥æŽ¡ç”¨å–®ä½å¾Œç¶´è¡¨ç¤º, \"m\"表示分"
-"é˜, \"h\"表示å°æ™‚, \"d\"代表天數"
+"檢測網路連線的頻率。é è¨­å–®ä½ç‚ºç§’,您å¯ä»¥ä½¿ç”¨â€œmâ€ä½œç‚ºå­—尾表示分é˜ï¼Œâ€œhâ€è¡¨ç¤ºå°"
+"時,“dâ€è¡¨ç¤ºå¤©ã€‚"
msgid ""
"In periodic mode, it defines the reboot period. In internet mode, it defines "
@@ -30,9 +33,9 @@ msgid ""
"engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
"for hours or 'd' for days"
msgstr ""
-"Watchcat的定期模å¼,它將定義é‡é–‹é€±æœŸ. 在網際網路模å¼,它將定義在é‡é–‹è¢«è¨‚製若無"
-"Internetå­˜å–時採用較長時間週期 .é è¨­å–®ä½ç‚ºç§’數,å¯ä»¥æŽ¡ç”¨å–®ä½å¾Œç¶´è¡¨ç¤º, \"m\"表"
-"示分é˜, \"h\"表示å°æ™‚, \"d\"代表天數"
+"在週期模å¼ä¸‹ï¼Œæ­¤è™•å®šç¾©äº†é‡å•Ÿçš„週期。在è¯ç¶²æ¨¡å¼ä¸‹ï¼Œé€™å€‹è¡¨ç¤ºæ²’有網路連線情æ³ä¸‹"
+"到執行é‡å•Ÿçš„最長時間間隔。é è¨­å–®ä½ç‚ºç§’,您å¯ä»¥ä½¿ç”¨â€œmâ€ä½œç‚ºå­—尾表示分é˜ï¼Œâ€œhâ€è¡¨"
+"示å°æ™‚,“dâ€è¡¨ç¤ºå¤©ã€‚"
msgid "Operating mode"
msgstr "æ“作模å¼"
@@ -41,26 +44,23 @@ msgid "Period"
msgstr "週期"
msgid "Ping host"
-msgstr "Ping主機"
+msgstr "Ping 主機"
msgid "Ping period"
-msgstr "Ping週期"
+msgstr "Ping 週期"
msgid "Watchcat"
msgstr "Watchcat"
-#, fuzzy
msgid ""
"Watchcat allows configuring a periodic reboot when the Internet connection "
"has been lost for a certain period of time."
-msgstr ""
-"Watchcatå…許定期é‡å•“並且/或者當網際網路連線斷掉時經éŽæŸæ®µæ™‚間週期後é‡å•“"
+msgstr "Watchcat å…許在網路連線丟失一段時間後é…置定時é‡å•Ÿå‹•ã€‚"
-#, fuzzy
msgid ""
"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
"a non zero value here will trigger a delayed hard reboot if the soft reboot "
"fails. Enter a number of seconds to enable, use 0 to disable"
msgstr ""
-"é‡é–‹ç³»çµ±æ™‚watchcat將會觸發軟é‡é–‹, 如果軟é‡é–‹å¤±æ•—, 打入0以外的數字,將會觸發硬"
-"é‡é–‹å»¶é² . 打入秒數來啟用這功能,用0表示功能關閉"
+"當é‡å•Ÿç³»çµ±æ™‚,WatchCat 將觸發一個軟é‡å•Ÿã€‚åœ¨æ­¤è¼¸å…¥ä¸€å€‹éž 0 值,如果軟é‡å•Ÿå¤±æ•—"
+"將會觸發一個延é²çš„硬é‡å•Ÿã€‚輸入秒數啟用,輸入 0 ç¦ç”¨"
diff --git a/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po b/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po
new file mode 100644
index 0000000000..ad605e1d06
--- /dev/null
+++ b/applications/luci-app-wifischedule/po/zh-tw/wifischedule.po
@@ -0,0 +1,101 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8\n"
+
+msgid "Activate wifi"
+msgstr "啟用 WiFi"
+
+msgid "Could not find required /usr/bin/wifi_schedule.sh or /sbin/wifi"
+msgstr "無法找到必需的 /usr/bin/wifi_schedule.sh 或 /sbin/wifi"
+
+msgid "Could not find required programm /usr/bin/iwinfo"
+msgstr "無法找到必需程å¼ï¼š/usr/bin/iwinfo"
+
+msgid "Cron Jobs"
+msgstr "計劃任務"
+
+msgid "Day(s) of Week"
+msgstr "星期"
+
+msgid "Defines a schedule when to turn on and off wifi."
+msgstr "定義自動開啟和關閉 WiFi 的計劃表"
+
+msgid "Determine Modules Automatically"
+msgstr "自動確定模組"
+
+msgid "Disable wifi gracefully"
+msgstr "正常關閉 WiFi"
+
+msgid "Disabled wifi forced"
+msgstr "強制關閉 WiFi"
+
+msgid "Enable"
+msgstr "啟用"
+
+msgid "Enable Wifi Schedule"
+msgstr "啟用 WiFi 計劃"
+
+msgid "Enable logging"
+msgstr "啟用日誌"
+
+msgid "Force disabling wifi even if stations associated"
+msgstr "å³ä½¿æœ‰è£ç½®é€£ç·šä¹Ÿå¼·åˆ¶é—œé–‰ WiFi"
+
+msgid "Friday"
+msgstr "星期五"
+
+msgid "Global Settings"
+msgstr "全域性設定"
+
+msgid "Monday"
+msgstr "星期一"
+
+msgid "Saturday"
+msgstr "星期六"
+
+msgid "Schedule"
+msgstr "計劃表"
+
+msgid "Schedule events"
+msgstr "計劃事件"
+
+msgid "Start Time"
+msgstr "啟動時間"
+
+msgid "Start WiFi"
+msgstr "å•Ÿå‹• WiFi"
+
+msgid "Stop Time"
+msgstr "關閉時間"
+
+msgid "Stop WiFi"
+msgstr "關閉 WiFi"
+
+msgid "Sunday"
+msgstr "星期日"
+
+msgid "The value %s is invalid"
+msgstr "%s 的值無效"
+
+msgid "Thursday"
+msgstr "星期四"
+
+msgid "Tuesday"
+msgstr "星期二"
+
+msgid "Unload Modules (experimental; saves more power)"
+msgstr "解除安è£æ¨¡çµ„(實驗性的,節çœæ›´å¤šé›»é‡ï¼‰"
+
+msgid "View Cron Jobs"
+msgstr "檢視計劃任務"
+
+msgid "View Logfile"
+msgstr "檢視日誌檔案"
+
+msgid "Wednesday"
+msgstr "星期三"
+
+msgid "Wifi Schedule"
+msgstr "WiFi 計劃"
+
+msgid "Wifi Schedule Logfile"
+msgstr "WiFi 計劃日誌檔案"
diff --git a/applications/luci-app-wireguard/po/zh-cn/wireguard.po b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
index e873a83891..38fd784b12 100644
--- a/applications/luci-app-wireguard/po/zh-cn/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
@@ -1,14 +1,17 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
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: 2018-08-07 20:23+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.1\n"
-"Last-Translator: liushuyu <liushuyu011@gmail.com>\n"
+"X-Generator: Gtranslator 2.91.7\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: zh_CN\n"
@@ -16,7 +19,7 @@ msgid "Allowed IPs"
msgstr "å…许的 IP"
msgid "Collecting data..."
-msgstr "正在收集数æ®..."
+msgstr "正在收集数æ®â€¦"
msgid "Configuration"
msgstr "é…ç½®"
diff --git a/applications/luci-app-wireguard/po/zh-tw/wireguard.po b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
new file mode 100644
index 0000000000..66fd9649e6
--- /dev/null
+++ b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
@@ -0,0 +1,76 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
+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"
+"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"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_TW\n"
+
+msgid "Allowed IPs"
+msgstr "å…許的 IP"
+
+msgid "Collecting data..."
+msgstr "正在收集資料…"
+
+msgid "Configuration"
+msgstr "é…ç½®"
+
+msgid "Data Received"
+msgstr "已接收"
+
+msgid "Data Transmitted"
+msgstr "已傳é€"
+
+msgid "Endpoint"
+msgstr "傳輸端點"
+
+msgid "Firewall Mark"
+msgstr "防ç«ç‰†æ¨™è­˜"
+
+msgid "Interface"
+msgstr "介é¢"
+
+msgid "Interface does not have a public key!"
+msgstr "介é¢æ²’有é…置公鑰ï¼"
+
+msgid "Latest Handshake"
+msgstr "上次æ¡æ‰‹"
+
+msgid "Listen Port"
+msgstr "監è½åŸ "
+
+msgid "Never"
+msgstr "從ä¸"
+
+msgid "Peer"
+msgstr "å°ç«¯"
+
+msgid "Persistent Keepalive"
+msgstr "Keepalive 間隔(秒)"
+
+msgid "Public Key"
+msgstr "公鑰"
+
+msgid "WireGuard Status"
+msgstr "WireGuard 狀態"
+
+msgid "h ago"
+msgstr "å°æ™‚å‰"
+
+msgid "m ago"
+msgstr "分é˜å‰"
+
+msgid "over a day ago"
+msgstr "超éŽä¸€å¤©å‰"
+
+msgid "s ago"
+msgstr "秒å‰"
diff --git a/applications/luci-app-wol/po/zh-cn/wol.po b/applications/luci-app-wol/po/zh-cn/wol.po
index 3c66a16b0c..910bfa6c85 100644
--- a/applications/luci-app-wol/po/zh-cn/wol.po
+++ b/applications/luci-app-wol/po/zh-cn/wol.po
@@ -1,12 +1,12 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-19 00:29+0200\n"
-"PO-Revision-Date: 2017-10-28 16:44+0800\n"
+"PO-Revision-Date: 2018-08-07 16:45+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_CN\n"
@@ -31,10 +31,9 @@ msgstr "选择使用的网络接å£"
msgid "Send to broadcast address"
msgstr "å‘é€åˆ°å¹¿æ’­åœ°å€"
-#, fuzzy
msgid ""
"Sometimes only one of the two tools works. If one fails, try the other one"
-msgstr "有时åªæœ‰ä¸€ä¸ªå·¥å…·ç”Ÿæ•ˆã€‚如果其中一个失效,请å°è¯•å¦ä¸€ä¸ª"
+msgstr "这两个工具有时åªæœ‰ä¸€ä¸ªç”Ÿæ•ˆã€‚如果其中一个失效,请å°è¯•å¦ä¸€ä¸ª"
msgid "Specifies the interface the WoL packet is sent on"
msgstr "é™å®šå°†å‘é€ç½‘络唤醒数æ®åŒ…的接å£"
diff --git a/applications/luci-app-wol/po/zh-tw/wol.po b/applications/luci-app-wol/po/zh-tw/wol.po
index 3ef8ea2e2c..cbabaa054d 100644
--- a/applications/luci-app-wol/po/zh-tw/wol.po
+++ b/applications/luci-app-wol/po/zh-tw/wol.po
@@ -1,12 +1,12 @@
#
-# Yangfl <mmyangfl@gmail.com>, 2017.
+# Yangfl <mmyangfl@gmail.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-19 00:29+0200\n"
-"PO-Revision-Date: 2017-10-28 16:44+0800\n"
+"PO-Revision-Date: 2018-08-07 17:24+0800\n"
"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
"Language: zh_TW\n"
@@ -20,7 +20,7 @@ msgid "Broadcast on all interfaces"
msgstr "å‘所有介é¢å»£æ’­"
msgid "Choose the host to wake up or enter a custom MAC address to use"
-msgstr "é¸æ“‡è¦å–šé†’的主機,或者輸入自定義 MAC ä½å€"
+msgstr "é¸æ“‡è¦å–šé†’的主機,或者輸入自訂 MAC ä½å€"
msgid "Host to wake up"
msgstr "é¸æ“‡è¦å–šé†’的主機"
@@ -31,10 +31,9 @@ msgstr "é¸æ“‡ä½¿ç”¨çš„網路介é¢"
msgid "Send to broadcast address"
msgstr "傳é€åˆ°å»£æ’­ä½å€"
-#, fuzzy
msgid ""
"Sometimes only one of the two tools works. If one fails, try the other one"
-msgstr "有時åªæœ‰ä¸€å€‹å·¥å…·ç”Ÿæ•ˆã€‚如果其中一個失效,請嘗試å¦ä¸€å€‹"
+msgstr "這兩個工具有時åªæœ‰ä¸€å€‹ç”Ÿæ•ˆã€‚如果其中一個失效,請嘗試å¦ä¸€å€‹"
msgid "Specifies the interface the WoL packet is sent on"
msgstr "é™å®šå°‡å‚³é€ç¶²è·¯å–šé†’資料包的介é¢"
diff --git a/modules/luci-base/luasrc/model/uci.lua b/modules/luci-base/luasrc/model/uci.lua
index b2c1e463bf..2119a210bb 100644
--- a/modules/luci-base/luasrc/model/uci.lua
+++ b/modules/luci-base/luasrc/model/uci.lua
@@ -95,41 +95,15 @@ end
function changes(self, config)
- local rv = call("changes", { config = config })
- local res = {}
+ local rv, err = call("changes", { config = config })
if type(rv) == "table" and type(rv.changes) == "table" then
- local package, changes
- for package, changes in pairs(rv.changes) do
- res[package] = {}
-
- local _, change
- for _, change in ipairs(changes) do
- local operation, section, option, value = unpack(change)
- if option and operation ~= "add" then
- res[package][section] = res[package][section] or { }
-
- if operation == "list-add" then
- local v = res[package][section][option]
- if type(v) == "table" then
- v[#v+1] = value or ""
- elseif v ~= nil then
- res[package][section][option] = { v, value }
- else
- res[package][section][option] = { value }
- end
- else
- res[package][section][option] = value or ""
- end
- else
- res[package][section] = res[package][section] or {}
- res[package][section][".type"] = option or ""
- end
- end
- end
+ return rv.changes
+ elseif err then
+ return nil, ERRSTR[err]
+ else
+ return { }
end
-
- return res
end
diff --git a/modules/luci-base/luasrc/sys.lua b/modules/luci-base/luasrc/sys.lua
index 823e20770c..1436a3a235 100644
--- a/modules/luci-base/luasrc/sys.lua
+++ b/modules/luci-base/luasrc/sys.lua
@@ -70,6 +70,24 @@ function mounts()
return data
end
+function mtds()
+ local data = {}
+
+ if fs.access("/proc/mtd") then
+ for l in io.lines("/proc/mtd") do
+ local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
+ if s and n then
+ local d = {}
+ d.size = tonumber(s, 16)
+ d.name = n
+ table.insert(data, d)
+ end
+ end
+ end
+
+ return data
+end
+
-- containing the whole environment is returned otherwise this function returns
-- the corresponding string value for the given name or nil if no such variable
-- exists.
diff --git a/modules/luci-base/luasrc/view/cbi/apply_widget.htm b/modules/luci-base/luasrc/view/cbi/apply_widget.htm
index 4d7e9c56ea..ce279edd40 100644
--- a/modules/luci-base/luasrc/view/cbi/apply_widget.htm
+++ b/modules/luci-base/luasrc/view/cbi/apply_widget.htm
@@ -158,7 +158,7 @@
uci_status_message('notice',
'<img src="<%=resource%>/icons/loading.gif" alt="" style="vertical-align:middle" /> ' +
- '<%:Waiting for configuration to get applied… %ds%>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0)));
+ '<%:Waiting for configuration to be applied… %ds%>'.format(Math.max(Math.floor((deadline - Date.now()) / 1000), 0)));
if (now >= deadline)
return;
diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm
index 942ab72e77..8eec865348 100644
--- a/modules/luci-base/luasrc/view/cbi/value.htm
+++ b/modules/luci-base/luasrc/view/cbi/value.htm
@@ -1,6 +1,6 @@
<%+cbi/valueheader%>
<%- if self.password then -%>
- <input type="password" style="position:absolute; left:-1000px"<%=
+ <input type="password" style="position:absolute; left:-1000px" aria-hidden="true" tabindex="-1"<%=
attr("name", "password." .. cbid)
%> />
<%- end -%>
diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index 5885894499..603c77834f 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -596,6 +596,12 @@ msgstr "Cancel·la"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Cadena"
@@ -698,8 +704,8 @@ msgstr "Configuració"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Es mantindran els fitxers de configuració."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1308,6 +1314,9 @@ msgstr "Força el TKIP i el CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1471,6 +1480,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Adreça IP"
@@ -1516,6 +1528,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "Longitud de prefix IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Adreça IPv4"
@@ -2048,6 +2063,9 @@ msgstr "Mode"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Dispositiu mòdem"
@@ -2232,9 +2250,6 @@ msgstr "No associat"
msgid "Not connected"
msgstr "No connectat"
-msgid "Note: Configuration files will be erased."
-msgstr "Nota: Els fitxers de configuració s'esborraran."
-
msgid "Note: interface name length"
msgstr ""
@@ -2930,6 +2945,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3744,7 +3765,7 @@ msgstr "Esperant que s'apliquin els canvis..."
msgid "Waiting for command to complete..."
msgstr "Esperant que s'acabi l'ordre..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3982,6 +4003,12 @@ msgstr "sí"
msgid "« Back"
msgstr "« Enrere"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Es mantindran els fitxers de configuració."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Nota: Els fitxers de configuració s'esborraran."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Parella: %s / Grup: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/cs/base.po b/modules/luci-base/po/cs/base.po
index 4075c5b06f..b5947dbcf8 100644
--- a/modules/luci-base/po/cs/base.po
+++ b/modules/luci-base/po/cs/base.po
@@ -589,6 +589,12 @@ msgstr "Storno"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Řetěz"
@@ -692,8 +698,8 @@ msgstr "Nastavení"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "KonfiguraÄní soubory budou zachovány."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1310,6 +1316,9 @@ msgstr "Vynutit TKIP a CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1470,6 +1479,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP adresy"
@@ -1515,6 +1527,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "Délka IPv4 prefixu"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4 adresa"
@@ -2056,6 +2071,9 @@ msgstr "Mód"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Modemové zařízení"
@@ -2240,9 +2258,6 @@ msgstr "Neasociováno"
msgid "Not connected"
msgstr "Nepřipojeno"
-msgid "Note: Configuration files will be erased."
-msgstr "Pozn: KonfiguraÄní soubory budou vymazány."
-
msgid "Note: interface name length"
msgstr ""
@@ -2944,6 +2959,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Podrobnosti viz manuálová stránka příkazu \"mount\""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3776,7 +3797,7 @@ msgstr "Čekání na realizaci změn..."
msgid "Waiting for command to complete..."
msgstr "ÄŒekání na dokonÄení příkazu..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4012,6 +4033,12 @@ msgstr "ano"
msgid "« Back"
msgstr "« Zpět"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "KonfiguraÄní soubory budou zachovány."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Pozn: KonfiguraÄní soubory budou vymazány."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/de/base.po b/modules/luci-base/po/de/base.po
index fd7bb4c388..e7f8826df8 100644
--- a/modules/luci-base/po/de/base.po
+++ b/modules/luci-base/po/de/base.po
@@ -609,6 +609,12 @@ msgstr "Abbrechen"
msgid "Category"
msgstr "Kategorie"
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Kette"
@@ -720,8 +726,8 @@ msgstr "Konfiguration"
msgid "Configuration failed"
msgstr "Konfiguration fehlgeschlagen"
-msgid "Configuration files will be kept."
-msgstr "Konfigurationsdateien sichern"
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr "Die Konfiguration wurde angewendet."
@@ -1360,6 +1366,9 @@ msgstr "Erzwinge TKIP und CCMP (AES)"
msgid "Force link"
msgstr "Erzwinge Verbindung"
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr "Benutzung von NAT-T erzwingen"
@@ -1523,6 +1532,9 @@ msgstr ""
msgid "IP Addresses"
msgstr "IP-Adressen"
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP-Adresse"
@@ -1568,6 +1580,9 @@ msgstr "IPv4 Bereich"
msgid "IPv4 prefix length"
msgstr "Länge des IPv4 Präfix"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-Adresse"
@@ -2136,6 +2151,9 @@ msgstr "Modus"
msgid "Model"
msgstr "Modell"
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Modemgerät"
@@ -2321,9 +2339,6 @@ msgstr "Nicht assoziiert"
msgid "Not connected"
msgstr "Nicht verbunden"
-msgid "Note: Configuration files will be erased."
-msgstr "Warnung: Konfigurationsdateien werden gelöscht."
-
msgid "Note: interface name length"
msgstr "Hinweis: Länge des Namens beachten"
@@ -3058,6 +3073,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Siehe \"mount\" Handbuch für Details"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3940,7 +3961,7 @@ msgstr "Änderungen werden angewandt..."
msgid "Waiting for command to complete..."
msgstr "Der Befehl wird ausgeführt..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr "Warte auf das Anwenden der Konfigurationsänderungen... %d Sekunden"
msgid "Waiting for device..."
@@ -4180,6 +4201,12 @@ msgstr "ja"
msgid "« Back"
msgstr "« Zurück"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Konfigurationsdateien sichern"
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Warnung: Konfigurationsdateien werden gelöscht."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Paarweise: %s / Gruppe: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/el/base.po b/modules/luci-base/po/el/base.po
index cb5706930a..839e5ff83d 100644
--- a/modules/luci-base/po/el/base.po
+++ b/modules/luci-base/po/el/base.po
@@ -598,6 +598,12 @@ msgstr "ΑκÏÏωση"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Αλυσίδα"
@@ -701,8 +707,8 @@ msgstr "ΠαÏαμετÏοποίηση"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Τα αÏχεία παÏαμετÏοποίησης θα διατηÏηθοÏν."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1324,6 +1330,9 @@ msgstr "Επιβολή TKIP και CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1483,6 +1492,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "ΔιεÏθυνση IP"
@@ -1528,6 +1540,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-ΔιεÏθυνση"
@@ -2063,6 +2078,9 @@ msgstr "ΛειτουÏγία"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Συσκευή Modem"
@@ -2248,9 +2266,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr "Σημείωση: Τα αÏχεία παÏαμετÏοποίησης θα διαγÏαφοÏν."
-
msgid "Note: interface name length"
msgstr ""
@@ -2948,6 +2963,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Δείτε το manpage του \"mount\" για λεπτομέÏειες"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3740,7 +3761,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3977,6 +3998,12 @@ msgstr "ναι"
msgid "« Back"
msgstr "« Πίσω"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Τα αÏχεία παÏαμετÏοποίησης θα διατηÏηθοÏν."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Σημείωση: Τα αÏχεία παÏαμετÏοποίησης θα διαγÏαφοÏν."
+
#~ msgid "Activate this network"
#~ msgstr "ΕνεÏγοποίηση Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… δικτÏου"
diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index dc5c22a659..603d39275d 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -587,6 +587,12 @@ msgstr "Cancel"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Chain"
@@ -689,8 +695,8 @@ msgstr "Configuration"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Configuration files will be kept."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1300,6 +1306,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1458,6 +1467,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP address"
@@ -1503,6 +1515,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr ""
@@ -2032,6 +2047,9 @@ msgstr "Mode"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Modem device"
@@ -2216,9 +2234,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2914,6 +2929,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3699,7 +3720,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3934,6 +3955,9 @@ msgstr ""
msgid "« Back"
msgstr "« Back"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Configuration files will be kept."
+
#~ msgid "Activate this network"
#~ msgstr "Activate this network"
diff --git a/modules/luci-base/po/es/base.po b/modules/luci-base/po/es/base.po
index 635dc11603..67415460c7 100644
--- a/modules/luci-base/po/es/base.po
+++ b/modules/luci-base/po/es/base.po
@@ -594,6 +594,12 @@ msgstr "Cancelar"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Cadena"
@@ -698,8 +704,8 @@ msgstr "Configuración"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Se mantendrán los ficheros de configuración."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1318,6 +1324,9 @@ msgstr "Forzar TKIP y CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1480,6 +1489,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Dirección IP"
@@ -1525,6 +1537,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "Longitud de prefijo IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Dirección IPv4"
@@ -2071,6 +2086,9 @@ msgstr "Modo"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Dispositivo de módem"
@@ -2255,9 +2273,6 @@ msgstr "No asociado"
msgid "Not connected"
msgstr "No conectado"
-msgid "Note: Configuration files will be erased."
-msgstr "Nota: se borrarán los ficheros de configuración."
-
msgid "Note: interface name length"
msgstr ""
@@ -2959,6 +2974,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Vea la página del manual de \"mount\" para detalles"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3804,7 +3825,7 @@ msgstr "Esperando a que se realicen los cambios..."
msgid "Waiting for command to complete..."
msgstr "Esperando a que termine el comando..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4041,6 +4062,12 @@ msgstr "sí"
msgid "« Back"
msgstr "« Volver"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Se mantendrán los ficheros de configuración."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Nota: se borrarán los ficheros de configuración."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Grupo: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/fr/base.po b/modules/luci-base/po/fr/base.po
index 3805627b6b..204c5e88c6 100644
--- a/modules/luci-base/po/fr/base.po
+++ b/modules/luci-base/po/fr/base.po
@@ -599,6 +599,12 @@ msgstr "Annuler"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Chaîne"
@@ -704,8 +710,8 @@ msgstr "Configuration"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Les fichiers de configuration seront préservés."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1329,6 +1335,9 @@ msgstr "Forcer TKIP et CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1491,6 +1500,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Adresse IP"
@@ -1536,6 +1548,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "longueur du préfixe IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Adresse IPv4"
@@ -2084,6 +2099,9 @@ msgstr "Mode"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Interface Modem"
@@ -2268,9 +2286,6 @@ msgstr "Pas associé"
msgid "Not connected"
msgstr "Non connecté"
-msgid "Note: Configuration files will be erased."
-msgstr "Note : les fichiers de configuration seront effacés."
-
msgid "Note: interface name length"
msgstr ""
@@ -2971,6 +2986,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Voir le manuel de « mount » pour les détails"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3822,7 +3843,7 @@ msgstr "En attente de l'application des changements..."
msgid "Waiting for command to complete..."
msgstr "En attente de la fin de la commande..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4058,6 +4079,12 @@ msgstr "oui"
msgid "« Back"
msgstr "« Retour"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Les fichiers de configuration seront préservés."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Note : les fichiers de configuration seront effacés."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/he/base.po b/modules/luci-base/po/he/base.po
index 6a5be78feb..73a4622814 100644
--- a/modules/luci-base/po/he/base.po
+++ b/modules/luci-base/po/he/base.po
@@ -589,6 +589,12 @@ msgstr "בטל"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "שרשרת"
@@ -683,8 +689,8 @@ msgstr "הגדרות"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "קבצי ההגדרות ישמרו."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1286,6 +1292,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1442,6 +1451,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr ""
@@ -1487,6 +1499,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr ""
@@ -2008,6 +2023,9 @@ msgstr ""
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr ""
@@ -2190,9 +2208,6 @@ msgstr ""
msgid "Not connected"
msgstr "×œ× ×ž×—×•×‘×¨"
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2878,6 +2893,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3650,7 +3671,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3880,6 +3901,9 @@ msgstr "כן"
msgid "« Back"
msgstr "<< ×חורה"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "קבצי ההגדרות ישמרו."
+
#~ msgid "Activate this network"
#~ msgstr "הפעל רשת זו"
diff --git a/modules/luci-base/po/hu/base.po b/modules/luci-base/po/hu/base.po
index 4b66806a83..47a0197c94 100644
--- a/modules/luci-base/po/hu/base.po
+++ b/modules/luci-base/po/hu/base.po
@@ -593,6 +593,12 @@ msgstr "Mégsem"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Lánc"
@@ -699,8 +705,8 @@ msgstr "Beállítás"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "A konfigurációs fájlok megmaradnak."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1320,6 +1326,9 @@ msgstr "TKIP és CCMP (AES) kényszerítése"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1480,6 +1489,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP cím"
@@ -1525,6 +1537,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "IPv4 prefix hossza"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-cím"
@@ -2073,6 +2088,9 @@ msgstr "Mód"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Modemeszköz"
@@ -2257,9 +2275,6 @@ msgstr "Nincs hozzárendelve"
msgid "Not connected"
msgstr "Nincs kapcsolódva"
-msgid "Note: Configuration files will be erased."
-msgstr "Megjegyzés: konfigurációs fájlok törölve lesznek."
-
msgid "Note: interface name length"
msgstr ""
@@ -2962,6 +2977,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Részletekért lásd a 'mount' man oldalát"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3809,7 +3830,7 @@ msgstr "Várakozás a változtatások alkalmazására..."
msgid "Waiting for command to complete..."
msgstr "Várakozás a parancs befejezésére..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4047,6 +4068,12 @@ msgstr "igen"
msgid "« Back"
msgstr "« Vissza"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "A konfigurációs fájlok megmaradnak."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Megjegyzés: konfigurációs fájlok törölve lesznek."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/it/base.po b/modules/luci-base/po/it/base.po
index 1fe6d06cb9..83fb6054b3 100644
--- a/modules/luci-base/po/it/base.po
+++ b/modules/luci-base/po/it/base.po
@@ -601,6 +601,12 @@ msgstr "Annulla"
msgid "Category"
msgstr "Categoria"
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Catena"
@@ -705,8 +711,8 @@ msgstr "Configurazione"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "I file di configurazione verranno mantenuti."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1323,6 +1329,9 @@ msgstr "Forza TKIP e CCMP (AES)"
msgid "Force link"
msgstr "Forza collegamento"
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr "Forza uso del NAT-T"
@@ -1486,6 +1495,9 @@ msgstr ""
msgid "IP Addresses"
msgstr "Indirizzi IP"
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Indirizzo IP"
@@ -1531,6 +1543,9 @@ msgstr "Prefisso IPv4"
msgid "IPv4 prefix length"
msgstr "Lunghezza prefisso IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Indirizzo-IPv4"
@@ -2074,6 +2089,9 @@ msgstr "Modalità"
msgid "Model"
msgstr "Modello"
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Dispositivo modem"
@@ -2258,9 +2276,6 @@ msgstr "Non associato"
msgid "Not connected"
msgstr "Non connesso"
-msgid "Note: Configuration files will be erased."
-msgstr "Nota: i files di Configurazione saranno eliminati"
-
msgid "Note: interface name length"
msgstr "Nota: lunghezza nome interfaccia"
@@ -2960,6 +2975,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Vedi \"mount\" manpage per dettagli"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3778,7 +3799,7 @@ msgstr "In attesa delle modifiche da applicare ..."
msgid "Waiting for command to complete..."
msgstr "In attesa del comando da completare..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4017,6 +4038,12 @@ msgstr "Sì"
msgid "« Back"
msgstr "« Indietro"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "I file di configurazione verranno mantenuti."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Nota: i files di Configurazione saranno eliminati"
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Accoppiata: %s / Gruppo: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/ja/base.po b/modules/luci-base/po/ja/base.po
index fd60f84da6..b0d74f97ce 100644
--- a/modules/luci-base/po/ja/base.po
+++ b/modules/luci-base/po/ja/base.po
@@ -3,14 +3,14 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2018-07-20 15:27+0900\n"
+"PO-Revision-Date: 2018-09-01 03:29+0900\n"
"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
"Language: ja\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: Poedit 2.0.8\n"
+"X-Generator: Poedit 2.1.1\n"
"Language-Team: \n"
msgid "%.1f dB"
@@ -273,10 +273,10 @@ msgid "Alert"
msgstr "警告"
msgid "Alias Interface"
-msgstr ""
+msgstr "エイリアス インターフェース"
msgid "Alias of \"%s\""
-msgstr ""
+msgstr "\"%s\" ã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹"
msgid "All Servers"
msgstr "å…¨ã¦ã®ã‚µãƒ¼ãƒãƒ¼"
@@ -598,6 +598,12 @@ msgstr "キャンセル"
msgid "Category"
msgstr "カテゴリー"
+msgid "Caution: Configuration files will be erased"
+msgstr "注æ„: 設定ファイルã¯æ¶ˆåŽ»ã•ã‚Œã¾ã™"
+
+msgid "Caution: System upgrade will be forced"
+msgstr "注æ„: システムã¯å¼·åˆ¶çš„ã«ã‚¢ãƒƒãƒ—グレードã•ã‚Œã¾ã™"
+
msgid "Chain"
msgstr "ãƒã‚§ã‚¤ãƒ³"
@@ -707,10 +713,10 @@ msgid "Configuration"
msgstr "設定"
msgid "Configuration failed"
-msgstr ""
+msgstr "設定ãŒå¤±æ•—ã—ã¾ã—ãŸ"
-msgid "Configuration files will be kept."
-msgstr "設定ファイルã¯ä¿æŒã•ã‚Œã¾ã™ã€‚"
+msgid "Configuration files will be kept"
+msgstr "設定ファイルã¯ä¿æŒã•ã‚Œã¾ã™"
msgid "Configuration has been applied."
msgstr "設定ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸã€‚"
@@ -1342,6 +1348,9 @@ msgstr "TKIP åŠã³CCMP (AES) を使用"
msgid "Force link"
msgstr "強制リンク"
+msgid "Force upgrade"
+msgstr "強制アップグレード"
+
msgid "Force use of NAT-T"
msgstr "NAT-Tã®å¼·åˆ¶ä½¿ç”¨"
@@ -1502,6 +1511,9 @@ msgstr "IKE DHグループ"
msgid "IP Addresses"
msgstr "IPアドレス"
+msgid "IP Protocol"
+msgstr "IP プロトコル"
+
msgid "IP address"
msgstr "IPアドレス"
@@ -1547,6 +1559,9 @@ msgstr "IPv4 プレフィクス"
msgid "IPv4 prefix length"
msgstr "IPv4 プレフィクス長"
+msgid "IPv4+IPv6"
+msgstr "IPv4+IPv6"
+
msgid "IPv4-Address"
msgstr "IPv4-アドレス"
@@ -1672,6 +1687,8 @@ msgid ""
"In order to prevent unauthorized access to the system, your request has been "
"blocked. Click \"Continue »\" below to return to the previous page."
msgstr ""
+"システムã¸ã®æœªèªè¨¼ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’防ããŸã‚ã«ã€ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯ãƒ–ロックã•ã‚Œã¾ã—ãŸã€‚以"
+"下㮠\"続行\" をクリックã—ã¦ã€å‰ã®ãƒšãƒ¼ã‚¸ã«æˆ»ã‚Šã¾ã™ã€‚"
msgid "Inactivity timeout"
msgstr "未使用時タイムアウト"
@@ -1966,6 +1983,8 @@ msgid ""
"Localise hostname depending on the requesting subnet if multiple IPs are "
"available"
msgstr ""
+"複数㮠IP ãŒåˆ©ç”¨å¯èƒ½ãªå ´åˆã«ã€ãƒ›ã‚¹ãƒˆåをリクエスト中ã®ã‚µãƒ–ãƒãƒƒãƒˆã«ã‚ˆã£ã¦ãƒ­ãƒ¼"
+"カライズã—ã¾ã™"
msgid "Localise queries"
msgstr "ローカライズクエリ"
@@ -1996,7 +2015,7 @@ msgstr ""
"ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’オフセットã¨ã—ã¦ã€æœ€å°ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’設定ã—ã¦ãã ã•ã„"
msgid "MAC"
-msgstr ""
+msgstr "MAC"
msgid "MAC-Address"
msgstr "MAC-アドレス"
@@ -2060,7 +2079,7 @@ msgstr ""
"6in4-, pppoe- ãªã©ï¼‰ã¨åˆã‚ã›ã¦æœ€å¤§15文字ã§ã™ã€‚"
msgid "Maximum number of leased addresses."
-msgstr "リースã™ã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹ã®æœ€å¤§æ•°ã§ã™"
+msgstr "リースã•ã‚Œã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹ã®æœ€å¤§æ•°ã§ã™ã€‚"
msgid "Mbit/s"
msgstr "Mbit/s"
@@ -2095,6 +2114,9 @@ msgstr "モード"
msgid "Model"
msgstr "モデル"
+msgid "Modem default"
+msgstr "モデム デフォルト"
+
msgid "Modem device"
msgstr "モデム デãƒã‚¤ã‚¹"
@@ -2279,9 +2301,6 @@ msgstr "アソシエーションã•ã‚Œã¦ã„ã¾ã›ã‚“"
msgid "Not connected"
msgstr "未接続"
-msgid "Note: Configuration files will be erased."
-msgstr "注æ„: 設定ファイルã¯æ¶ˆåŽ»ã•ã‚Œã¾ã™ã€‚"
-
msgid "Note: interface name length"
msgstr "注æ„: インターフェースåã®é•·ã•"
@@ -2345,7 +2364,7 @@ msgid "One or more required fields have no value!"
msgstr "1ã¤ä»¥ä¸Šã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã«å€¤ãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼"
msgid "Open list..."
-msgstr "リストを開ã"
+msgstr "リストを開ã..."
msgid "OpenConnect (CISCO AnyConnect)"
msgstr "OpenConnect (CISCO AnyConnect)"
@@ -2503,7 +2522,7 @@ msgid "PTM/EFM (Packet Transfer Mode)"
msgstr ""
msgid "Package libiwinfo required!"
-msgstr "libiwinfo パッケージをインストールã—ã¦ãã ã•ã„ï¼"
+msgstr "libiwinfo パッケージãŒå¿…è¦ã§ã™ï¼"
msgid "Package lists are older than 24 hours"
msgstr "パッケージ リストã¯24時間以上å‰ã®ã‚‚ã®ã§ã™"
@@ -2530,7 +2549,7 @@ msgid "Password of inner Private Key"
msgstr "秘密éµã®ãƒ‘スワード"
msgid "Password successfully changed!"
-msgstr "パスワードを変更ã—ã¾ã—ãŸ"
+msgstr "パスワードを変更ã—ã¾ã—ãŸï¼"
msgid "Password2"
msgstr "パスワード2"
@@ -2738,9 +2757,8 @@ msgid ""
"access to this device if you are connected via this interface"
msgstr ""
"本当ã«ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’削除ã—ã¾ã™ã‹ï¼Ÿä¸€åº¦å‰Šé™¤ã™ã‚‹ã¨ã€å…ƒã«æˆ»ã™ã“ã¨ã¯ã§ã"
-"ã¾ã›ã‚“ï¼\n"
-"ã‚‚ã—ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’経由ã—ã¦æŽ¥ç¶šã—ã¦ã„ã‚‹å ´åˆã€ã“ã®ãƒ‡ãƒã‚¤ã‚¹ã«ã‚¢ã‚¯ã‚»ã‚¹ã§"
-"ããªããªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™"
+"ã¾ã›ã‚“ï¼ã‚‚ã—ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’経由ã—ã¦æŽ¥ç¶šã—ã¦ã„ã‚‹å ´åˆã€ã“ã®ãƒ‡ãƒã‚¤ã‚¹ã«ã‚¢"
+"クセスã§ããªããªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™"
msgid ""
"Really delete this wireless network? The deletion cannot be undone! You "
@@ -2999,6 +3017,15 @@ msgid "See \"mount\" manpage for details"
msgstr "詳細情報㯠\"mount\" ã®manページをå‚ç…§ã—ã¦ãã ã•ã„"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+"イメージ形å¼ã®ãƒã‚§ãƒƒã‚¯ãŒå¤±æ•—ã—ãŸå ´åˆã§ã‚‚æ›´æ–°ã‚’è¡Œã†å ´åˆã€'強制アップグレード' "
+"ã‚’é¸æŠžã—ã¦ãã ã•ã„。ファームウェアãŒæ­£ã—ã„ã“ã¨ã€ãƒ‡ãƒã‚¤ã‚¹ã«é©ã—ã¦ã„ã‚‹ã“ã¨ã‚’確"
+"èªã§ãã¦ã„ã‚‹å ´åˆã«ã®ã¿ä½¿ç”¨ã—ã¦ãã ã•ã„ï¼"
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3305,6 +3332,8 @@ msgstr ""
msgid ""
"The IPv6 prefix assigned to the provider, usually ends with <code>::</code>"
msgstr ""
+"プロãƒã‚¤ãƒ€ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã‚‹ IPv6 プレフィクスã§ã™ã€‚通常〠<code>::</code> ã§çµ‚"
+"ã‚ã‚Šã¾ã™ã€‚"
msgid ""
"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
@@ -3845,7 +3874,7 @@ msgstr "変更をé©ç”¨ä¸­ã§ã™..."
msgid "Waiting for command to complete..."
msgstr "コマンド実行中ã§ã™..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr "設定をé©ç”¨ä¸­ã§ã™... %d 秒"
msgid "Waiting for device..."
@@ -4083,52 +4112,3 @@ msgstr "ã¯ã„"
msgid "« Back"
msgstr "« 戻る"
-
-#~ msgid "Activate this network"
-#~ msgstr "ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’有効ã«ã™ã‚‹"
-
-#~ msgid "Hermes 802.11b Wireless Controller"
-#~ msgstr "Hermes 802.11b 無線LANコントローラ"
-
-#~ msgid "Interface is shutting down..."
-#~ msgstr "インターフェース終了中..."
-
-#~ msgid "Interface reconnected"
-#~ msgstr "インターフェースã®å†æŽ¥ç¶š"
-
-#~ msgid "Interface shut down"
-#~ msgstr "インターフェースã®çµ‚了"
-
-#~ msgid "Prism2/2.5/3 802.11b Wireless Controller"
-#~ msgstr "Prism2/2.5/3 802.11b 無線LANコントローラ"
-
-#~ msgid "RaLink 802.11%s Wireless Controller"
-#~ msgstr "RaLink 802.11%s 無線LANコントローラ"
-
-#~ msgid ""
-#~ "Really shut down network? You might lose access to this device if you are "
-#~ "connected via this interface"
-#~ msgstr ""
-#~ "本当ã«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’åœæ­¢ã—ã¾ã™ã‹ï¼Ÿ\n"
-#~ "ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’経由ã—ã¦æŽ¥ç¶šã—ã¦ã„ã‚‹å ´åˆã€ãƒ‡ãƒã‚¤ã‚¹ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚‹"
-#~ "å ´åˆãŒã‚ã‚Šã¾ã™"
-
-#~ msgid ""
-#~ "Really shutdown interface \"%s\"? You might lose access to this device if "
-#~ "you are connected via this interface."
-#~ msgstr ""
-#~ "本当ã«ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ \"%s\" ã‚’åœæ­¢ã—ã¾ã™ã‹?\n"
-#~ "ã“ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‚’経由ã—ã¦æŽ¥ç¶šã—ã¦ã„ã‚‹å ´åˆã€ãƒ‡ãƒã‚¤ã‚¹ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã"
-#~ "ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚"
-
-#~ msgid "Reconnecting interface"
-#~ msgstr "インターフェースå†æŽ¥ç¶šä¸­"
-
-#~ msgid "Shutdown this network"
-#~ msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’終了"
-
-#~ msgid "Wireless restarted"
-#~ msgstr "ç„¡ç·šLAN機能ã®å†èµ·å‹•"
-
-#~ msgid "Wireless shut down"
-#~ msgstr "ç„¡ç·šLAN機能åœæ­¢"
diff --git a/modules/luci-base/po/ko/base.po b/modules/luci-base/po/ko/base.po
index 2d53437dbd..92a36e67f2 100644
--- a/modules/luci-base/po/ko/base.po
+++ b/modules/luci-base/po/ko/base.po
@@ -583,6 +583,12 @@ msgstr ""
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr ""
@@ -685,7 +691,7 @@ msgstr "설정"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration files will be kept"
msgstr ""
msgid "Configuration has been applied."
@@ -1298,6 +1304,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1457,6 +1466,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP 주소"
@@ -1502,6 +1514,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-주소"
@@ -2025,6 +2040,9 @@ msgstr ""
msgid "Model"
msgstr "모ë¸"
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr ""
@@ -2207,9 +2225,6 @@ msgstr ""
msgid "Not connected"
msgstr "ì—°ê²°ë˜ì§€ ì•ŠìŒ"
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2907,6 +2922,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3703,7 +3724,7 @@ msgstr "변경 ì‚¬í•­ì´ ì ìš©ë˜ê¸°ë¥¼ 기다리는 중입니다..."
msgid "Waiting for command to complete..."
msgstr "실행한 ëª…ë ¹ì´ ë나기를 기다리는 중입니다..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po
index 891db2e41f..b17c961bda 100644
--- a/modules/luci-base/po/ms/base.po
+++ b/modules/luci-base/po/ms/base.po
@@ -573,6 +573,12 @@ msgstr "Batal"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Rantai"
@@ -668,7 +674,7 @@ msgstr "Konfigurasi"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration files will be kept"
msgstr ""
msgid "Configuration has been applied."
@@ -1271,6 +1277,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1429,6 +1438,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Alamat IP"
@@ -1474,6 +1486,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr ""
@@ -2004,6 +2019,9 @@ msgstr "Mode"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Alat modem"
@@ -2188,9 +2206,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2884,6 +2899,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Rujuk \"mount\" laman manual untuk detail"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3670,7 +3691,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index d5c65659e8..d7e128a8b9 100644
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -585,6 +585,12 @@ msgstr "Avbryt"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Lenke"
@@ -689,8 +695,8 @@ msgstr "Konfigurasjon"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Konfigurasjonsfiler vil bli bevart."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1307,6 +1313,9 @@ msgstr "Bruk TKIP og CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1467,6 +1476,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP adresse"
@@ -1512,6 +1524,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "IPv4 prefikslengde"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-Adresse"
@@ -2048,6 +2063,9 @@ msgstr "Modus"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Modem"
@@ -2232,9 +2250,6 @@ msgstr "Ikke tilknyttet"
msgid "Not connected"
msgstr "Ikke tilkoblet"
-msgid "Note: Configuration files will be erased."
-msgstr "Merk: Konfigurasjonsfiler vil bli slettet"
-
msgid "Note: interface name length"
msgstr ""
@@ -2936,6 +2951,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Se \"mount\" manpage for detaljer"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3775,7 +3796,7 @@ msgstr "Venter på at endringer utføres..."
msgid "Waiting for command to complete..."
msgstr "Venter på at kommando fullføres..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4013,6 +4034,12 @@ msgstr "ja"
msgid "« Back"
msgstr "« Tilbake"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Konfigurasjonsfiler vil bli bevart."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Merk: Konfigurasjonsfiler vil bli slettet"
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Parvis: %s / Gruppe: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/pl/base.po b/modules/luci-base/po/pl/base.po
index 61aee199b7..5295b3d90a 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-07-21 18:35+0200\n"
+"PO-Revision-Date: 2018-09-02 15:25+0200\n"
"Last-Translator: Rixerx <krystian.kozak20@gmail.com>\n"
"Language-Team: Polish\n"
"Language: pl\n"
@@ -210,11 +210,11 @@ msgid "ATM device number"
msgstr "Numer urzÄ…dzenia ATM"
msgid "ATU-C System Vendor ID"
-msgstr ""
+msgstr "ID dostawcy systemu ATU-C"
# co to takiego?
msgid "Access Concentrator"
-msgstr "Koncentrator dostępowy ATM"
+msgstr "Koncentrator dostępowy (ATM)"
msgid "Access Point"
msgstr "Punkt dostępowy"
@@ -273,7 +273,7 @@ msgid "Advanced Settings"
msgstr "Ustawienia zaawansowane"
msgid "Aggregate Transmit Power(ACTATP)"
-msgstr ""
+msgstr "Agregacja siły transmisji (ACTATP)"
msgid "Alert"
msgstr "Alarm"
@@ -592,6 +592,8 @@ msgid ""
"Build/distribution specific feed definitions. This file will NOT be "
"preserved in any sysupgrade."
msgstr ""
+"Kompiluj/rozpowszechniaj określone definicje źródeł. Ten plik NIE zostanie "
+"zachowany w procesie sysupgrade"
msgid "CA certificate; if empty it will be saved after the first connection."
msgstr ""
@@ -608,6 +610,12 @@ msgstr "Anuluj"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte"
+
+msgid "Caution: System upgrade will be forced"
+msgstr "Uwaga: Zostanie wymuszone uaktualnienie systemu"
+
msgid "Chain"
msgstr "ÅaÅ„cuch"
@@ -684,7 +692,7 @@ msgid ""
"Close inactive connection after the given amount of seconds, use 0 to "
"persist connection"
msgstr ""
-"Zamykaj nieaktywne połączenia po określonym czasie podanym w sekundach, "
+"Zamknij nieaktywne połączenia po określonym czasie podanym w sekundach, "
"wpisz 0 aby uzyskać stałe połączenie."
msgid "Close list..."
@@ -717,8 +725,8 @@ msgstr "Konfiguracja"
msgid "Configuration failed"
msgstr "Konfiguracja nieudana"
-msgid "Configuration files will be kept."
-msgstr "Pliki konfiguracyjne zostanÄ… zachowane."
+msgid "Configuration files will be kept"
+msgstr "Pliki konfiguracyjne zostanÄ… zachowane"
msgid "Configuration has been applied."
msgstr "Konfiguracja została zastosowana."
@@ -782,15 +790,17 @@ msgid "Custom Interface"
msgstr "Interfejs niestandardowy"
msgid "Custom delegated IPv6-prefix"
-msgstr ""
+msgstr "Delegowany niestandardowy prefiks IPv6"
msgid ""
"Custom feed definitions, e.g. private feeds. This file can be preserved in a "
"sysupgrade."
msgstr ""
+"Niestandardowe definicje plików danych, np. prywatne źródła. Ten plik może "
+"być zachowany podczas sysupgrade. "
msgid "Custom feeds"
-msgstr ""
+msgstr "Niestandardowe źródła"
msgid ""
"Custom files (certificates, scripts) may remain on the system. To prevent "
@@ -864,7 +874,7 @@ msgid "DUID"
msgstr "DUID"
msgid "Data Rate"
-msgstr ""
+msgstr "Szybkość przesyłania danych"
msgid "Debug"
msgstr "Debug"
@@ -981,7 +991,7 @@ msgid "Distance to farthest network member in meters."
msgstr "Odległość do najdalej oddalonego członka sieci w metrach."
msgid "Distribution feeds"
-msgstr ""
+msgstr "Dystrybucja źródeł"
# Jak poprzednio trzymam siÄ™ konwencji
msgid "Diversity"
@@ -993,10 +1003,10 @@ msgid ""
"Forwarder for <abbr title=\"Network Address Translation\">NAT</abbr> "
"firewalls"
msgstr ""
-"Dnsmasq jest kombajnem serwera <abbr title=\"Dynamic Host Configuration Protocol"
-"\">DHCP</abbr> połączonym z serwerem <abbr title=\"Domain Name System\">DNS</"
-"abbr>. Jest to serwer przekazujÄ…cy (Fowarder) dla firewalli <abbr title="
-"\"Network Address Translation\">NAT</abbr>"
+"Dnsmasq jest kombajnem serwera <abbr title=\"Dynamic Host Configuration "
+"Protocol\">DHCP</abbr> połączonym z serwerem <abbr title=\"Domain Name System"
+"\">DNS</abbr>. Jest to serwer przekazujÄ…cy (Fowarder) dla firewalli <abbr "
+"title=\"Network Address Translation\">NAT</abbr>"
msgid "Do not cache negative replies, e.g. for not existing domains"
msgstr "Nie cache`uj odpowiedzi negatywnych, np. nie dla bieżących domen"
@@ -1198,7 +1208,7 @@ msgid "Error"
msgstr "BÅ‚Ä…d"
msgid "Errored seconds (ES)"
-msgstr ""
+msgstr "Ilość błędów (ES)"
msgid "Ethernet Adapter"
msgstr "Karta Ethernet"
@@ -1302,7 +1312,7 @@ msgid "Firewall Status"
msgstr "Stan firewalla"
msgid "Firmware File"
-msgstr ""
+msgstr "Plik firmware"
msgid "Firmware Version"
msgstr "Wersja firmware"
@@ -1347,6 +1357,9 @@ msgstr "WymuÅ› TKIP i CCMP (AES)"
msgid "Force link"
msgstr "Wymuś połączenie"
+msgid "Force upgrade"
+msgstr "WymuÅ› uaktualnienie"
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1357,7 +1370,7 @@ msgid "Forward DHCP traffic"
msgstr "Przekazuj ruch DHCP"
msgid "Forward Error Correction Seconds (FECS)"
-msgstr ""
+msgstr "Próby korekcji błędów (FECS)"
msgid "Forward broadcast traffic"
msgstr "Przekazuj broadcast`y"
@@ -1407,7 +1420,7 @@ msgid "General Setup"
msgstr "Ustawienia podstawowe"
msgid "General options for opkg"
-msgstr ""
+msgstr "Ogólne opcje dla opkg"
msgid "Generate Config"
msgstr "Wygeneruj konfiguracjÄ™"
@@ -1457,7 +1470,7 @@ msgid "Hang Up"
msgstr "Rozłącz"
msgid "Header Error Code Errors (HEC)"
-msgstr ""
+msgstr "Błędy kodu nagłówka (HEC)"
msgid ""
"Here you can configure the basic aspects of your device like its hostname or "
@@ -1512,6 +1525,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr "Protokół IP"
+
msgid "IP address"
msgstr "Adres IP"
@@ -1557,6 +1573,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "Długość prefiksu IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Adres IPv4"
@@ -1812,7 +1831,7 @@ msgid "LCP echo failure threshold"
msgstr "Próg błędu echa LCP"
msgid "LCP echo interval"
-msgstr "Częstotliwość echa LCP"
+msgstr "Interwał echa LCP"
msgid "LLC"
msgstr "LLC"
@@ -1845,10 +1864,10 @@ msgid "Leasetime remaining"
msgstr "Pozostały czas dzierżawy"
msgid "Leave empty to autodetect"
-msgstr "Pozostaw niewypełnione dla autodetekcji"
+msgstr "Pozostaw puste, aby automatycznie wykryć"
msgid "Leave empty to use the current WAN address"
-msgstr "Pozostaw niewypełnione aby użyć bieżącego adresu WAN"
+msgstr "Pozostaw puste, aby użyć bieżącego adresu WAN"
msgid "Legend:"
msgstr "Legenda:"
@@ -1864,16 +1883,16 @@ msgid "Limit listening to these interfaces, and loopback."
msgstr "Ogranicz nasłuchiwanie do tych interfesjów, oraz loopbacku."
msgid "Line Attenuation (LATN)"
-msgstr ""
+msgstr "TÅ‚umienie linii (LATN)"
msgid "Line Mode"
-msgstr ""
+msgstr "Tryb linii"
msgid "Line State"
-msgstr ""
+msgstr "Stan linii"
msgid "Line Uptime"
-msgstr ""
+msgstr "Czas działania linii"
msgid "Link On"
msgstr "Połączenie aktywne"
@@ -2000,7 +2019,7 @@ msgid "Logout"
msgstr "Wyloguj"
msgid "Loss of Signal Seconds (LOSS)"
-msgstr ""
+msgstr "Utrata sygnału (LOSS)"
msgid "Lowest leased address as offset from the network address."
msgstr "Najniższy wydzierżawiony adres jako offset dla adresu sieci."
@@ -2049,7 +2068,7 @@ msgid "Manual"
msgstr ""
msgid "Max. Attainable Data Rate (ATTNDR)"
-msgstr ""
+msgstr "Max. Osiągalna przepustowość danych (ATTNDR)"
msgid "Maximum allowed number of active DHCP leases"
msgstr "Maksymalna dozwolona liczba aktywnych dzierżaw DHCP"
@@ -2104,8 +2123,11 @@ msgstr "Tryb"
msgid "Model"
msgstr "Model"
+msgid "Modem default"
+msgstr "Domyślny modem"
+
msgid "Modem device"
-msgstr "Modem"
+msgstr "UrzÄ…dzenie modemowe"
msgid "Modem information query failed"
msgstr "Zapytanie dotyczące modemu nie powiodło się"
@@ -2244,7 +2266,7 @@ msgid "No network name specified"
msgstr "Nie podano nazwy sieci"
msgid "No package lists available"
-msgstr "Brak dostępu do listy pakietów"
+msgstr "Lista pakietów nie jest dostępna"
msgid "No password set!"
msgstr "Nie ustawiono hasła!"
@@ -2268,7 +2290,7 @@ msgid "Noise:"
msgstr "Szum:"
msgid "Non Pre-emtive CRC errors (CRC_P)"
-msgstr ""
+msgstr "Nieprzewidziane błedy CRC (CRC_P)"
msgid "Non-wildcard"
msgstr "Bez symboli wieloznacznych"
@@ -2288,9 +2310,6 @@ msgstr "Nie powiÄ…zany"
msgid "Not connected"
msgstr "Nie podłączony"
-msgid "Note: Configuration files will be erased."
-msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte."
-
msgid "Note: interface name length"
msgstr ""
@@ -2318,7 +2337,7 @@ msgid "Obfuscated Password"
msgstr ""
msgid "Obtain IPv6-Address"
-msgstr ""
+msgstr "Uzyskaj adres IPv6"
msgid "Off-State Delay"
msgstr "Zwłoka wyłączenia"
@@ -2613,13 +2632,13 @@ msgid "Power Management Mode"
msgstr "Tryb zarzÄ…dzania energiÄ…"
msgid "Pre-emtive CRC errors (CRCP_P)"
-msgstr ""
+msgstr "Przewidziane błedy CRC (CRCP_P)"
msgid "Prefer LTE"
-msgstr ""
+msgstr "Preferuj LTE"
msgid "Prefer UMTS"
-msgstr ""
+msgstr "Preferuj UMTS"
msgid "Prefix Delegated"
msgstr ""
@@ -2631,8 +2650,8 @@ msgid ""
"Presume peer to be dead after given amount of LCP echo failures, use 0 to "
"ignore failures"
msgstr ""
-"Zakładaj że klient jest martwy po danej ilości błedów odpowiedzi echa LCP, "
-"wpisz 0 aby zignorować błędy"
+"Przypuszczaj że klient może być martwy po zadanej ilości błedów echa LCP, "
+"wpisz 0 aby zignorować te błędy"
msgid "Prevent listening on these interfaces."
msgstr "Zapobiegaj nasłuchiwaniu na tych interfejsach."
@@ -2692,7 +2711,8 @@ msgid ""
"Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
"servers"
msgstr ""
-"Zapytaj o wszystkie dostępne serwery <abbr title=\"Domain Name System\">DNS</abbr> "
+"Zapytaj o wszystkie dostępne serwery <abbr title=\"Domain Name System\">DNS</"
+"abbr> "
msgid "R0 Key Lifetime"
msgstr ""
@@ -2840,7 +2860,7 @@ msgid "Request IPv6-address"
msgstr "Zażądaj adresu IPv6"
msgid "Request IPv6-prefix of length"
-msgstr ""
+msgstr "Zażądaj długość prefiksu IPv6"
msgid "Required"
msgstr "Wymagany"
@@ -2909,13 +2929,13 @@ msgid "Revert"
msgstr "Przywróć"
msgid "Revert changes"
-msgstr ""
+msgstr "Przywróć zmiany"
msgid "Revert request failed with status <code>%h</code>"
-msgstr ""
+msgstr "Żądanie powrotu nie powiodło się ze statusem <code>%h</code>"
msgid "Reverting configuration…"
-msgstr ""
+msgstr "Przywracanie konfiguracji…"
msgid "Root"
msgstr "Root"
@@ -3004,11 +3024,20 @@ msgid "See \"mount\" manpage for details"
msgstr "Aby poznać szczegóły przeczytaj stronę instrukcji \"mount\""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+"Wybierz 'Wymuś uaktualnienie', aby wgrać obraz nawet jeśli sprawdzenie "
+"formatu obrazu nie powiedzie się. Używaj tylko wtedy, gdy masz pewność że "
+"oprogramowanie jest poprawne i jest przeznaczone dla Twojego urzÄ…dzenia!"
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
-"Co podany czas (w sekundach) wyślij zapytania LCP echo, to ustawienie działa "
-"tylko gdy ustawiony jest próg błędu LCP echo"
+"Wysyłaj żądania echa LCP w określonym przedziale czasowym, efektywne tylko "
+"wtedy gdy jest ustawiony próg błedu LCP"
msgid "Separate Clients"
msgstr "Rozdziel klientów"
@@ -3046,7 +3075,7 @@ msgid "Setup DHCP Server"
msgstr "Ustawienia serwera DHCP"
msgid "Severely Errored Seconds (SES)"
-msgstr ""
+msgstr "Ilość poważnych błedów (SES)"
msgid "Short GI"
msgstr ""
@@ -3064,7 +3093,7 @@ msgid "Signal"
msgstr "Sygnał"
msgid "Signal Attenuation (SATN)"
-msgstr ""
+msgstr "Tłumienie sygnału (SATN)"
msgid "Signal:"
msgstr "Sygnał:"
@@ -3073,7 +3102,7 @@ msgid "Size"
msgstr "Rozmiar"
msgid "Size (.ipk)"
-msgstr ""
+msgstr "Rozmiar (.ipk)"
msgid "Size of DNS query cache"
msgstr "Rozmiar pamięci podręcznej zapytań DNS"
@@ -3159,7 +3188,7 @@ msgid "Start priority"
msgstr "Priorytet uruchomienia"
msgid "Starting configuration apply…"
-msgstr ""
+msgstr "Zatwierdzanie konfiguracji…"
msgid "Starting wireless scan..."
msgstr "Rozpoczynanie skanowania..."
@@ -3193,7 +3222,7 @@ msgstr ""
"odpowiednim dzierżawami."
msgid "Status"
-msgstr "Stan"
+msgstr "Status"
msgid "Stop"
msgstr "Stop"
@@ -3365,10 +3394,9 @@ msgid ""
"compare them with the original file to ensure data integrity.<br /> Click "
"\"Proceed\" below to start the flash procedure."
msgstr ""
-"Obraz flash`a został przesłany. Poniżej znajduje się suma kontrolna i "
-"rozmiar obrazu, porównaj je z sumą kontrolną i rozmiarem oryginału, aby "
-"upewnić się, że został przesłany poprawnie.<br /> Wciśnij \"Wykonaj\" aby "
-"kontynuować aktualizację."
+"Obraz flash został przesłany. Poniżej znajduje się suma kontrolna i rozmiar "
+"pliku, porównaj je z orginałem aby zapewnić integralność danych.<br /> "
+"Wciśnij \"Wykonaj\" aby kontynuować aktualizację."
msgid "The following changes have been reverted"
msgstr "Następujące zmiany zostały odrzucone"
@@ -3450,7 +3478,7 @@ msgid "There are no active leases."
msgstr "Brak aktywnych dzierżaw."
msgid "There are no changes to apply."
-msgstr "Nie ma żadnych zmian do zastosowania."
+msgstr "Brak zmian do zastosowania."
msgid "There are no pending changes to revert!"
msgstr "Brak oczekujących zmian do przywrócenia!"
@@ -3569,7 +3597,7 @@ msgstr ""
"\"Wykonaj reset\" (możliwe tylko w przypadku obrazu squashfs)."
msgid "Tone"
-msgstr ""
+msgstr "Ton"
msgid "Total Available"
msgstr "Całkowicie dostępna"
@@ -3656,7 +3684,7 @@ msgid "Unable to resolve peer host name"
msgstr "Nie można rozpoznać nazwy peera"
msgid "Unavailable Seconds (UAS)"
-msgstr ""
+msgstr "Czas niedostępnośći (UAS)"
msgid "Unknown"
msgstr "Nieznany"
@@ -3861,7 +3889,7 @@ msgstr "Trwa wprowadzenie zmian..."
msgid "Waiting for command to complete..."
msgstr "Trwa wykonanie polecenia..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr "Oczekiwanie na zastosowanie konfiguracji… %ds"
msgid "Waiting for device..."
@@ -4105,6 +4133,12 @@ msgstr "tak"
msgid "« Back"
msgstr "« Wróć"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Pliki konfiguracyjne zostanÄ… zachowane."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Par: %s / Grup: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/pt-br/base.po b/modules/luci-base/po/pt-br/base.po
index 63a8b2f340..bf5ca103a6 100644
--- a/modules/luci-base/po/pt-br/base.po
+++ b/modules/luci-base/po/pt-br/base.po
@@ -630,6 +630,12 @@ msgstr "Cancelar"
msgid "Category"
msgstr "Categoria"
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Cadeia"
@@ -736,8 +742,8 @@ msgstr "Configuração"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Os arquivos de configuração serão mantidos."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1370,6 +1376,9 @@ msgstr "Forçar TKIP e CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr "Force o uso do NAT-T"
@@ -1544,6 +1553,9 @@ msgstr ""
msgid "IP Addresses"
msgstr "Endereços IP"
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Endereço IP"
@@ -1589,6 +1601,9 @@ msgstr "Prefixo IPv4"
msgid "IPv4 prefix length"
msgstr "Tamanho do prefixo IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Endereço IPv4"
@@ -2168,6 +2183,9 @@ msgstr "Modo"
msgid "Model"
msgstr "Modelo"
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Dispositivo do Modem"
@@ -2354,9 +2372,6 @@ msgstr "Não conectado"
msgid "Not connected"
msgstr "Não conectado"
-msgid "Note: Configuration files will be erased."
-msgstr "Nota: Os arquivos de configuração serão apagados."
-
msgid "Note: interface name length"
msgstr "Aviso: tamanho do nome da interface"
@@ -3081,6 +3096,12 @@ msgid "See \"mount\" manpage for details"
msgstr "Veja o manual (man) do comando \"mount\" para detalhes"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3950,7 +3971,7 @@ msgstr "Esperando a aplicação das mudanças..."
msgid "Waiting for command to complete..."
msgstr "Esperando o término do comando..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4194,6 +4215,12 @@ msgstr "sim"
msgid "« Back"
msgstr "« Voltar"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Os arquivos de configuração serão mantidos."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Nota: Os arquivos de configuração serão apagados."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Par: %s / Grupo: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/pt/base.po b/modules/luci-base/po/pt/base.po
index d548b7c8d5..cf23162aaf 100644
--- a/modules/luci-base/po/pt/base.po
+++ b/modules/luci-base/po/pt/base.po
@@ -598,6 +598,12 @@ msgstr "Cancelar"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Cadeia"
@@ -702,8 +708,8 @@ msgstr "Configuração"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Os ficheiros de configuração serão mantidos."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1324,6 +1330,9 @@ msgstr "Forçar TKIP e CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1488,6 +1497,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Endereço IP"
@@ -1533,6 +1545,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "Comprimento do prefixo IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Endereço-IPv4"
@@ -2072,6 +2087,9 @@ msgstr "Modo"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Dispositivo do modem"
@@ -2256,9 +2274,6 @@ msgstr "Não associado"
msgid "Not connected"
msgstr "Não ligado"
-msgid "Note: Configuration files will be erased."
-msgstr "Nota: Os ficheiros de configuração serão apagados."
-
msgid "Note: interface name length"
msgstr ""
@@ -2957,6 +2972,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3769,7 +3790,7 @@ msgstr "A aguardar que as mudanças sejam aplicadas..."
msgid "Waiting for command to complete..."
msgstr "A aguardar que o comando termine..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -4009,6 +4030,12 @@ msgstr "sim"
msgid "« Back"
msgstr "« Voltar"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Os ficheiros de configuração serão mantidos."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Nota: Os ficheiros de configuração serão apagados."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Emparelhada: %s / Grupo: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/ro/base.po b/modules/luci-base/po/ro/base.po
index a28235bbd7..bbd60abb69 100644
--- a/modules/luci-base/po/ro/base.po
+++ b/modules/luci-base/po/ro/base.po
@@ -581,6 +581,12 @@ msgstr "Anuleaza"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Lant"
@@ -678,8 +684,8 @@ msgstr "Configurare"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Fisierele de configurare vor fi pastrate."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1278,6 +1284,9 @@ msgstr "Forteaza TKIP si CCMP (AES)"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1436,6 +1445,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Adresa IP"
@@ -1481,6 +1493,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "Adresa IPv4"
@@ -2005,6 +2020,9 @@ msgstr "Mod"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr ""
@@ -2187,9 +2205,6 @@ msgstr "Nu este asociat."
msgid "Not connected"
msgstr "Nu este conectat"
-msgid "Note: Configuration files will be erased."
-msgstr "Nota: fisierele de configurare vor fi sterse."
-
msgid "Note: interface name length"
msgstr ""
@@ -2877,6 +2892,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3646,7 +3667,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3876,6 +3897,12 @@ msgstr "da"
msgid "« Back"
msgstr "« Inapoi"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Fisierele de configurare vor fi pastrate."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Nota: fisierele de configurare vor fi sterse."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po
index 8d542e6018..d84167a520 100644
--- a/modules/luci-base/po/ru/base.po
+++ b/modules/luci-base/po/ru/base.po
@@ -3,7 +3,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Project-Id-Version: LuCI: base\n"
"POT-Creation-Date: 2010-05-09 01:01+0300\n"
-"PO-Revision-Date: 2018-07-21 08:10+0300\n"
+"PO-Revision-Date: 2018-09-05 21:48+0300\n"
"Language-Team: http://cyber-place.ru\n"
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -274,13 +274,13 @@ msgid "Alert"
msgstr "Тревога"
msgid "Alias Interface"
-msgstr ""
+msgstr "ПÑевдоним"
msgid "Alias of \"%s\""
-msgstr ""
+msgstr "ПÑевдоним интерфейÑа \"%s\""
msgid "All Servers"
-msgstr ""
+msgstr "Ð’Ñе Ñерверы"
msgid ""
"Allocate IP addresses sequentially, starting from the lowest available "
@@ -298,6 +298,8 @@ msgstr ""
msgid "Allow AP mode to disconnect STAs based on low ACK condition"
msgstr ""
+"Разрешить режиму AP отключение абонентов на оÑновании низкого ÑƒÑ€Ð¾Ð²Ð½Ñ "
+"Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ (Acknowledge) уÑпешноÑти Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ TCP-Ñегментов"
msgid "Allow all except listed"
msgstr "Разрешить вÑе, кроме перечиÑленных"
@@ -339,6 +341,8 @@ msgid ""
"Always use 40MHz channels even if the secondary channel overlaps. Using this "
"option does not comply with IEEE 802.11n-2009!"
msgstr ""
+"Ð’Ñегда иÑпользовать каналы 40 МГц, даже еÑли вторичный канал перекрываетÑÑ. "
+"ИÑпользование Ñтой опции не ÑоответÑтвует Ñтандарту IEEE 802.11n-2009!"
msgid "Annex"
msgstr "Annex"
@@ -544,7 +548,7 @@ msgid "Band"
msgstr "Диапазон"
msgid "Beacon Interval"
-msgstr ""
+msgstr "Интервал раÑÑылки пакетов Beacon"
msgid ""
"Below is the determined list of files to backup. It consists of changed "
@@ -616,6 +620,12 @@ msgstr "Отменить"
msgid "Category"
msgstr "КатегориÑ"
+msgid "Caution: Configuration files will be erased"
+msgstr "Внимание: файлы конфигурации будут удалены"
+
+msgid "Caution: System upgrade will be forced"
+msgstr "Внимание: выбрано принудительное обновление ÑиÑтемы"
+
msgid "Chain"
msgstr "Цепочка"
@@ -729,8 +739,8 @@ msgstr "ÐаÑтройка config файла"
msgid "Configuration failed"
msgstr "Ошибка конфигурации"
-msgid "Configuration files will be kept."
-msgstr "Config файлы будут Ñохранены."
+msgid "Configuration files will be kept"
+msgstr "Конфигурационные файлы будут Ñохранены"
msgid "Configuration has been applied."
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð°"
@@ -874,7 +884,7 @@ msgid "DSL line mode"
msgstr "DSL линейный режим"
msgid "DTIM Interval"
-msgstr ""
+msgstr "Интервал DTIM"
msgid "DUID"
msgstr "DUID"
@@ -916,7 +926,7 @@ msgid "Delete this network"
msgstr "Удалить Ñту Ñеть"
msgid "Delivery Traffic Indication Message Interval"
-msgstr ""
+msgstr "Интервал Ñообщений, регламентирующий доÑтавку трафика"
msgid "Description"
msgstr "ОпиÑание"
@@ -977,7 +987,7 @@ msgid "Disabled (default)"
msgstr "Отключено (по умолчанию)"
msgid "Disassociate On Low Acknowledgement"
-msgstr ""
+msgstr "Ðе аÑÑоциировать при низком подтверждении"
msgid "Discard upstream RFC1918 responses"
msgstr "ОтбраÑывать ответы внешней Ñети RFC1918."
@@ -1348,7 +1358,7 @@ msgid "Force"
msgstr "Ðазначить"
msgid "Force 40MHz mode"
-msgstr ""
+msgstr "Принудительно иÑпользовать режим 40 МГц"
msgid "Force CCMP (AES)"
msgstr "Ðазначить CCMP (AES)"
@@ -1365,6 +1375,9 @@ msgstr "Ðазначить TKIP и CCMP (AES)"
msgid "Force link"
msgstr "Ðктивировать Ñоединение"
+msgid "Force upgrade"
+msgstr "ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ°"
+
msgid "Force use of NAT-T"
msgstr "Принудительно иÑпользовать NAT-T"
@@ -1527,6 +1540,9 @@ msgstr "IKE DH Group"
msgid "IP Addresses"
msgstr "IP-адреÑа"
+msgid "IP Protocol"
+msgstr "IP-протокол"
+
msgid "IP address"
msgstr "IP-адреÑ"
@@ -1572,6 +1588,9 @@ msgstr "IPv4 префикÑ"
msgid "IPv4 prefix length"
msgstr "Длина префикÑа IPv4"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-адреÑ"
@@ -1719,7 +1738,7 @@ msgid "Initscript"
msgstr "Скрипт инициализации"
msgid "Initscripts"
-msgstr "Скрипты инциализации"
+msgstr "Скрипты инициализации"
msgid "Install"
msgstr "УÑтановить"
@@ -2135,6 +2154,9 @@ msgstr "Режим"
msgid "Model"
msgstr "Модель"
+msgid "Modem default"
+msgstr "ÐаÑтройки модема по умолчанию"
+
msgid "Modem device"
msgstr "Модем"
@@ -2284,7 +2306,7 @@ msgid "No rules in this chain"
msgstr "Ðет правил в данной цепочке"
msgid "No scan results available yet..."
-msgstr ""
+msgstr "Результаты ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾ÐºÐ° недоÑтупны..."
msgid "No zone assigned"
msgstr "Зона не приÑвоена"
@@ -2319,9 +2341,6 @@ msgstr "Ðе ÑвÑзанный"
msgid "Not connected"
msgstr "Ðе подключено"
-msgid "Note: Configuration files will be erased."
-msgstr "Внимание: config файлы будут удалены."
-
msgid "Note: interface name length"
msgstr "Внимание: длина имени интерфейÑа"
@@ -2736,6 +2755,8 @@ msgid ""
"Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
"servers"
msgstr ""
+"Опрашивать вÑе имеющиеÑÑ Ð²Ð½ÐµÑˆÐ½Ð¸Ðµ <abbr title=\"Domain Name System\">DNS</"
+"abbr>-Ñерверы"
msgid "R0 Key Lifetime"
msgstr "R0 Key Ð²Ñ€ÐµÐ¼Ñ Ð¶Ð¸Ð·Ð½Ð¸"
@@ -3041,7 +3062,7 @@ msgid "Scan"
msgstr "ПоиÑк"
msgid "Scan request failed"
-msgstr ""
+msgstr "Ошибка запроÑа на Ñканирование"
msgid "Scheduled Tasks"
msgstr "Запланированные заданиÑ"
@@ -3056,6 +3077,15 @@ msgid "See \"mount\" manpage for details"
msgstr "Ð”Ð»Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ð¹ информации обратитеÑÑŒ к Ñправке по 'mount' (man mount)."
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+"Выберите 'ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¾ÑˆÐ¸Ð²ÐºÐ°' Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð¸ÑˆÐ²ÐºÐ¸ образа даже еÑли проверка "
+"формата завершаетÑÑ Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹. ИÑпользуйте Ñту опцию только еÑли уверены, "
+"что файл образа корректный и предназначен именно Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ уÑтройÑтва!"
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3102,7 +3132,7 @@ msgid "Short GI"
msgstr "Short GI"
msgid "Short Preamble"
-msgstr ""
+msgstr "ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ°Ñ Ð¿Ñ€ÐµÐ°Ð¼Ð±ÑƒÐ»Ð°"
msgid "Show current backup file list"
msgstr "Показать текущий ÑпиÑок файлов резервной копии"
@@ -3216,7 +3246,7 @@ msgid "Starting configuration apply…"
msgstr "Применение конфигурации..."
msgid "Starting wireless scan..."
-msgstr ""
+msgstr "Ðачато Ñканирование беÑпроводных Ñетей..."
msgid "Startup"
msgstr "Загрузка"
@@ -3921,7 +3951,7 @@ msgstr "Ожидание Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹..."
msgid "Waiting for command to complete..."
msgstr "Ожидание Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ‹..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr "Ожидание Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¸... %d Ñек."
msgid "Waiting for device..."
@@ -4087,7 +4117,7 @@ msgid "minutes"
msgstr "минут(ы)"
msgid "mixed WPA/WPA2"
-msgstr ""
+msgstr "Ñмешанный WPA/WPA2"
msgid "no"
msgstr "нет"
@@ -4164,6 +4194,12 @@ msgstr "да"
msgid "« Back"
msgstr "« Ðазад"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Config файлы будут Ñохранены."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Внимание: config файлы будут удалены."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Парный: %s / Групповой: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/sk/base.po b/modules/luci-base/po/sk/base.po
index 7cf9f6febb..a22640b9ce 100644
--- a/modules/luci-base/po/sk/base.po
+++ b/modules/luci-base/po/sk/base.po
@@ -567,6 +567,12 @@ msgstr ""
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr ""
@@ -661,7 +667,7 @@ msgstr ""
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration files will be kept"
msgstr ""
msgid "Configuration has been applied."
@@ -1258,6 +1264,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1414,6 +1423,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr ""
@@ -1459,6 +1471,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr ""
@@ -1980,6 +1995,9 @@ msgstr ""
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr ""
@@ -2162,9 +2180,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2850,6 +2865,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3614,7 +3635,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/sv/base.po b/modules/luci-base/po/sv/base.po
index 76b5825906..e892e04081 100644
--- a/modules/luci-base/po/sv/base.po
+++ b/modules/luci-base/po/sv/base.po
@@ -579,6 +579,12 @@ msgstr "Avbryt"
msgid "Category"
msgstr "Kategori"
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Kedja"
@@ -675,8 +681,8 @@ msgstr "Konfiguration"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "Konfigurationsfiler kommer att behållas."
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1278,6 +1284,9 @@ msgstr "Tvinga TKIP och CCMP (AES)"
msgid "Force link"
msgstr "Tvinga länk"
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr "Tvinga användning av NAT-T"
@@ -1434,6 +1443,9 @@ msgstr ""
msgid "IP Addresses"
msgstr "IP-adresser"
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP-adress"
@@ -1479,6 +1491,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-Adress"
@@ -2001,6 +2016,9 @@ msgstr "Läge"
msgid "Model"
msgstr "Modell"
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Modem-enhet"
@@ -2183,9 +2201,6 @@ msgstr "Inte associerad"
msgid "Not connected"
msgstr "Inte ansluten"
-msgid "Note: Configuration files will be erased."
-msgstr "Notera: Konfigurationsfiler kommer att raderas."
-
msgid "Note: interface name length"
msgstr "Notera: längden på gränssnittets namn"
@@ -2873,6 +2888,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3641,7 +3662,7 @@ msgstr "Väntar på att ändringarna ska tillämpas..."
msgid "Waiting for command to complete..."
msgstr "Väntar på att kommandot ska avsluta..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3877,6 +3898,12 @@ msgstr "ja"
msgid "« Back"
msgstr "« Bakåt"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "Konfigurationsfiler kommer att behållas."
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "Notera: Konfigurationsfiler kommer att raderas."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairvis: %s / Grupp: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index 2dacedfe79..d8621c02c5 100644
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -560,6 +560,12 @@ msgstr ""
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr ""
@@ -654,7 +660,7 @@ msgstr ""
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration files will be kept"
msgstr ""
msgid "Configuration has been applied."
@@ -1251,6 +1257,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1407,6 +1416,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr ""
@@ -1452,6 +1464,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr ""
@@ -1973,6 +1988,9 @@ msgstr ""
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr ""
@@ -2155,9 +2173,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2843,6 +2858,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3607,7 +3628,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/tr/base.po b/modules/luci-base/po/tr/base.po
index 383c683068..f8d89b4b17 100644
--- a/modules/luci-base/po/tr/base.po
+++ b/modules/luci-base/po/tr/base.po
@@ -1,15 +1,16 @@
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-11-25 14:47+0200\n"
-"Last-Translator: qbilay <qbilay@mynet.com>\n"
+"Project-Id-Version: \n"
+"PO-Revision-Date: 2018-09-13 22:59+0300\n"
+"Last-Translator: Yusuf Soyipek <yusuf@soyipek.com>\n"
"Language-Team: none\n"
"Language: tr\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: Pootle 2.0.6\n"
+"X-Generator: Poedit 2.1.1\n"
+"POT-Creation-Date: \n"
msgid "%.1f dB"
msgstr ""
@@ -48,7 +49,7 @@ msgid "-- match by uuid --"
msgstr "-- uuid'e göre eşleştir --"
msgid "-- please select --"
-msgstr ""
+msgstr "-- lütfen seçin --"
msgid "1 Minute Load:"
msgstr "1 Dakikalık Yük:"
@@ -240,13 +241,13 @@ msgid "Add new interface..."
msgstr "Yeni arabirim ekle..."
msgid "Additional Hosts files"
-msgstr ""
+msgstr "Ek Hosts dosyaları"
msgid "Additional servers file"
-msgstr ""
+msgstr "Ek sunucular dosyası"
msgid "Address"
-msgstr "Adresler"
+msgstr "Adres"
msgid "Address to access local relay bridge"
msgstr ""
@@ -406,7 +407,7 @@ msgid "Apply unchecked"
msgstr ""
msgid "Architecture"
-msgstr ""
+msgstr "Mimari"
msgid ""
"Assign a part of given length of every public IPv6-prefix to this interface"
@@ -420,7 +421,7 @@ msgid ""
msgstr ""
msgid "Associated Stations"
-msgstr ""
+msgstr "Ä°liÅŸkili istasyonlar"
msgid "Associations"
msgstr ""
@@ -429,10 +430,10 @@ msgid "Auth Group"
msgstr ""
msgid "Authentication"
-msgstr "Kimlik doÄŸrulama"
+msgstr "Kimlik DoÄŸrulama"
msgid "Authentication Type"
-msgstr ""
+msgstr "Kimlik doğrulama türü"
msgid "Authoritative"
msgstr "Yetkilendirme"
@@ -504,7 +505,7 @@ msgid "Backup"
msgstr "Yedekleme"
msgid "Backup / Flash Firmware"
-msgstr ""
+msgstr "Yedek/Firmware Yazma"
msgid "Backup file list"
msgstr ""
@@ -534,16 +535,16 @@ msgid "Bind the tunnel to this interface (optional)."
msgstr ""
msgid "Bitrate"
-msgstr ""
+msgstr "Bit hızı"
msgid "Bogus NX Domain Override"
msgstr ""
msgid "Bridge"
-msgstr ""
+msgstr "Köprü"
msgid "Bridge interfaces"
-msgstr ""
+msgstr "Köprü arabirimleri"
msgid "Bridge unit number"
msgstr ""
@@ -558,7 +559,7 @@ msgid "Broadcom BCM%04x 802.11 Wireless Controller"
msgstr ""
msgid "Buffered"
-msgstr ""
+msgstr "Tamponlu"
msgid ""
"Build/distribution specific feed definitions. This file will NOT be "
@@ -580,6 +581,12 @@ msgstr "Vazgeç"
msgid "Category"
msgstr "Kategori"
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "Zincir"
@@ -637,6 +644,8 @@ msgid ""
"Click \"Generate archive\" to download a tar archive of the current "
"configuration files."
msgstr ""
+"Mevcut yapılandırma dosyalarının yeni bir arşivini indirmek için \"Arşiv "
+"Oluştur\"'u tıklayın."
msgid "Client"
msgstr ""
@@ -674,7 +683,7 @@ msgstr ""
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration files will be kept"
msgstr ""
msgid "Configuration has been applied."
@@ -684,22 +693,22 @@ msgid "Configuration has been rolled back!"
msgstr ""
msgid "Confirmation"
-msgstr ""
+msgstr "Onayla"
msgid "Connect"
-msgstr ""
+msgstr "BaÄŸlan"
msgid "Connected"
-msgstr ""
+msgstr "Bağlandı"
msgid "Connection Limit"
-msgstr ""
+msgstr "Bağlantı limiti"
msgid "Connection attempt failed"
msgstr ""
msgid "Connections"
-msgstr ""
+msgstr "Bağlantılar"
msgid ""
"Could not regain access to the device after applying the configuration "
@@ -708,10 +717,10 @@ msgid ""
msgstr ""
msgid "Country"
-msgstr ""
+msgstr "Ãœlke"
msgid "Country Code"
-msgstr ""
+msgstr "Ãœlke Kodu"
msgid "Cover the following interface"
msgstr ""
@@ -723,19 +732,19 @@ msgid "Create / Assign firewall-zone"
msgstr ""
msgid "Create Interface"
-msgstr ""
+msgstr "Arabirim OluÅŸtur"
msgid "Create a bridge over multiple interfaces"
msgstr ""
msgid "Critical"
-msgstr ""
+msgstr "Kritik"
msgid "Cron Log Level"
msgstr ""
msgid "Custom Interface"
-msgstr ""
+msgstr "Özel Arabirim"
msgid "Custom delegated IPv6-prefix"
msgstr ""
@@ -822,19 +831,19 @@ msgid "Debug"
msgstr ""
msgid "Default %d"
-msgstr ""
+msgstr "Varsayılan"
msgid "Default gateway"
-msgstr ""
+msgstr "Default ağ geçidi"
msgid "Default is stateless + stateful"
msgstr ""
msgid "Default state"
-msgstr ""
+msgstr "Varsayılan durum"
msgid "Define a name for this network."
-msgstr ""
+msgstr "Bu ağ için bir ad tanımlayın."
msgid ""
"Define additional DHCP options, for example "
@@ -843,69 +852,71 @@ msgid ""
msgstr ""
msgid "Delete"
-msgstr ""
+msgstr "Sil"
msgid "Delete this network"
-msgstr ""
+msgstr "Bu ağı sil"
msgid "Delivery Traffic Indication Message Interval"
msgstr ""
msgid "Description"
-msgstr ""
+msgstr "Açıklama"
msgid "Design"
-msgstr ""
+msgstr "Tasarım"
msgid "Destination"
-msgstr ""
+msgstr "Hedef"
msgid "Device"
-msgstr ""
+msgstr "Cihaz"
msgid "Device Configuration"
-msgstr ""
+msgstr "Cihaz Yapılandırması"
msgid "Device is rebooting..."
-msgstr ""
+msgstr "Cihaz yeniden başlatılıyor..."
msgid "Device unreachable!"
-msgstr ""
+msgstr "Cihaz ulaşılamaz!"
msgid "Device unreachable! Still waiting for device..."
-msgstr ""
+msgstr "Cihaz ulaşılamaz! Hala cihazı bekliyorum..."
msgid "Diagnostics"
-msgstr ""
+msgstr "Tanı"
msgid "Dial number"
-msgstr ""
+msgstr "Arama numarası"
msgid "Directory"
-msgstr ""
+msgstr "Dizin"
msgid "Disable"
-msgstr ""
+msgstr "Pasif"
msgid ""
"Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for "
"this interface."
msgstr ""
+"Bu arabirim için <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr>'yi devre dışı bırakın."
msgid "Disable DNS setup"
-msgstr ""
+msgstr "DNS kurulumunu devre dışı"
msgid "Disable Encryption"
-msgstr ""
+msgstr "Şifrelemeyi Devre Dışı"
msgid "Disable this network"
-msgstr ""
+msgstr "Ağ devre dışı"
msgid "Disabled"
-msgstr ""
+msgstr "Devre dışı"
msgid "Disabled (default)"
-msgstr ""
+msgstr "Devre dışı (varsayılan)"
msgid "Disassociate On Low Acknowledgement"
msgstr ""
@@ -914,16 +925,16 @@ msgid "Discard upstream RFC1918 responses"
msgstr ""
msgid "Disconnection attempt failed"
-msgstr ""
+msgstr "Bağlantı kesme girişimi başarısız oldu"
msgid "Dismiss"
-msgstr ""
+msgstr "Reddet"
msgid "Displaying only packages containing"
-msgstr ""
+msgstr "Yalnızca içeren paketler görüntüleniyor"
msgid "Distance Optimization"
-msgstr ""
+msgstr "Mesafe Optimizasyonu"
msgid "Distance to farthest network member in meters."
msgstr ""
@@ -1140,7 +1151,7 @@ msgid "Expand hosts"
msgstr ""
msgid "Expires"
-msgstr ""
+msgstr "Süre Bitişi"
msgid ""
"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
@@ -1230,19 +1241,19 @@ msgid "Firmware File"
msgstr ""
msgid "Firmware Version"
-msgstr ""
+msgstr "Firmware Versiyon"
msgid "Fixed source port for outbound DNS queries"
msgstr ""
msgid "Flash Firmware"
-msgstr ""
+msgstr "Firmware Güncelle"
msgid "Flash image..."
-msgstr ""
+msgstr "Dosyayı yaz..."
msgid "Flash new firmware image"
-msgstr ""
+msgstr "Yeni firmware dosyasını yaz"
msgid "Flash operations"
msgstr ""
@@ -1271,6 +1282,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1299,10 +1313,10 @@ msgid "Frame Bursting"
msgstr ""
msgid "Free"
-msgstr ""
+msgstr "BoÅŸ"
msgid "Free space"
-msgstr ""
+msgstr "BoÅŸ alan"
msgid ""
"Further information about WireGuard interfaces and peers at <a href=\"http://"
@@ -1316,7 +1330,7 @@ msgid "GPRS only"
msgstr ""
msgid "Gateway"
-msgstr ""
+msgstr "Ağ Geçidi"
msgid "Gateway address is invalid"
msgstr ""
@@ -1340,7 +1354,7 @@ msgid "Generate PMK locally"
msgstr ""
msgid "Generate archive"
-msgstr ""
+msgstr "ArÅŸiv oluÅŸtur"
msgid "Generic 802.11%s Wireless Controller"
msgstr ""
@@ -1427,6 +1441,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr ""
@@ -1472,9 +1489,12 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
-msgid "IPv4-Address"
+msgid "IPv4+IPv6"
msgstr ""
+msgid "IPv4-Address"
+msgstr "IPv4-Adres"
+
msgid "IPv4-in-IPv4 (RFC2003)"
msgstr ""
@@ -1524,7 +1544,7 @@ msgid "IPv6 suffix"
msgstr ""
msgid "IPv6-Address"
-msgstr ""
+msgstr "IPv6-Adres"
msgid "IPv6-PD"
msgstr ""
@@ -1692,7 +1712,7 @@ msgid "Kernel Log"
msgstr ""
msgid "Kernel Version"
-msgstr ""
+msgstr "Çekirdek Versiyonu"
msgid "Key"
msgstr ""
@@ -1743,7 +1763,7 @@ msgid "Leasefile"
msgstr ""
msgid "Leasetime remaining"
-msgstr ""
+msgstr "Kalan kira süresi"
msgid "Leave empty to autodetect"
msgstr ""
@@ -1824,7 +1844,7 @@ msgid "Load"
msgstr ""
msgid "Load Average"
-msgstr ""
+msgstr "Ortalama Yük"
msgid "Loading"
msgstr ""
@@ -1848,7 +1868,7 @@ msgid "Local Startup"
msgstr ""
msgid "Local Time"
-msgstr ""
+msgstr "Yerel Zaman"
msgid "Local domain"
msgstr ""
@@ -1900,7 +1920,7 @@ msgid "MAC"
msgstr ""
msgid "MAC-Address"
-msgstr ""
+msgstr "MAC-Adres"
msgid "MAC-Address Filter"
msgstr ""
@@ -1964,7 +1984,7 @@ msgid "Mbit/s"
msgstr ""
msgid "Memory"
-msgstr ""
+msgstr "Bellek"
msgid "Memory usage (%)"
msgstr ""
@@ -1993,6 +2013,9 @@ msgstr ""
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr ""
@@ -2083,10 +2106,10 @@ msgid "Navigation"
msgstr ""
msgid "Netmask"
-msgstr ""
+msgstr "AÄŸ Maskesi"
msgid "Network"
-msgstr ""
+msgstr "AÄŸ"
msgid "Network Utilities"
msgstr ""
@@ -2146,7 +2169,7 @@ msgid "No zone assigned"
msgstr ""
msgid "Noise"
-msgstr ""
+msgstr "Parazit"
msgid "Noise Margin (SNR)"
msgstr ""
@@ -2175,9 +2198,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2334,7 +2354,7 @@ msgid "Override the table used for internal routes"
msgstr ""
msgid "Overview"
-msgstr ""
+msgstr "Genel Bakış"
msgid "Owner"
msgstr ""
@@ -2528,7 +2548,7 @@ msgid "Prot."
msgstr ""
msgid "Protocol"
-msgstr ""
+msgstr "Protokol"
msgid "Protocol family"
msgstr ""
@@ -2863,6 +2883,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3349,7 +3375,7 @@ msgid "Tone"
msgstr ""
msgid "Total Available"
-msgstr ""
+msgstr "Toplam Mevcut"
msgid "Traceroute"
msgstr ""
@@ -3481,7 +3507,7 @@ msgid "Uploaded File"
msgstr "Yüklenen Dosya"
msgid "Uptime"
-msgstr "Açılma süresi"
+msgstr "Çalışma Zamanı"
msgid "Use <code>/etc/ethers</code>"
msgstr ""
@@ -3627,7 +3653,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/uk/base.po b/modules/luci-base/po/uk/base.po
index e4cf1ed0a8..950d894b1d 100644
--- a/modules/luci-base/po/uk/base.po
+++ b/modules/luci-base/po/uk/base.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"PO-Revision-Date: 2018-07-20 11:30+0300\n"
+"PO-Revision-Date: 2018-09-01 00:10+0300\n"
"Last-Translator: Yurii <yuripet@gmail.com>\n"
"Language-Team: none\n"
"Language: uk\n"
@@ -628,6 +628,12 @@ msgstr "СкаÑувати"
msgid "Category"
msgstr "КатегоріÑ"
+msgid "Caution: Configuration files will be erased"
+msgstr "Увага: файли конфігурації буде видалено."
+
+msgid "Caution: System upgrade will be forced"
+msgstr "Увага: ÑиÑтему буде оновлено примуÑово"
+
msgid "Chain"
msgstr "Ланцюжок"
@@ -738,8 +744,8 @@ msgstr "КонфігураціÑ"
msgid "Configuration failed"
msgstr "Помилка налаштуваннÑ"
-msgid "Configuration files will be kept."
-msgstr "Конфігураційні файли буде збережено."
+msgid "Configuration files will be kept"
+msgstr "Конфігураційні файли буде збережено"
msgid "Configuration has been applied."
msgstr "Конфігурацію заÑтоÑовано."
@@ -1380,6 +1386,9 @@ msgstr "ПримуÑово TKIP та CCMP (AES)"
msgid "Force link"
msgstr "ПримуÑове з’єднаннÑ"
+msgid "Force upgrade"
+msgstr "ПримуÑове оновленнÑ"
+
msgid "Force use of NAT-T"
msgstr "ПримуÑово викориÑтовувати NAT-T"
@@ -1544,6 +1553,9 @@ msgstr "Група IKE DH"
msgid "IP Addresses"
msgstr "IP-адреÑи"
+msgid "IP Protocol"
+msgstr "IP-протокол"
+
msgid "IP address"
msgstr "IP-адреÑа"
@@ -1589,6 +1601,9 @@ msgstr "ÐŸÑ€ÐµÑ„Ñ–ÐºÑ IPv4"
msgid "IPv4 prefix length"
msgstr "Довжина префікÑа IPv4"
+msgid "IPv4+IPv6"
+msgstr "IPv4+IPv6"
+
msgid "IPv4-Address"
msgstr "IPv4-адреÑа"
@@ -2163,6 +2178,9 @@ msgstr "Режим"
msgid "Model"
msgstr "Модель"
+msgid "Modem default"
+msgstr "Типові Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼Ð¾Ð´ÐµÐ¼Ð°"
+
msgid "Modem device"
msgstr "Модем"
@@ -2347,9 +2365,6 @@ msgstr "Ðе пов’Ñзаний"
msgid "Not connected"
msgstr "Ðе підключено"
-msgid "Note: Configuration files will be erased."
-msgstr "Примітка: конфігураційні файли буде видалено."
-
msgid "Note: interface name length"
msgstr "Примітка: довжина імені інтерфейÑу"
@@ -3079,6 +3094,15 @@ msgid "See \"mount\" manpage for details"
msgstr "Подробиці дивиÑÑŒ на Ñторінці керівництва \"mount\"."
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+"Щоб прошити образ, навіть Ñкщо не вдаєтьÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ перевірку його формату, "
+"виберіть \"ПримуÑове оновленнÑ\". ВикориÑтовуйте тільки Ñкщо ви впевнені, що "
+"мікропрограма Ñ” правильною Ñ– призначена Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ приÑтрою!"
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3234,7 +3258,7 @@ msgid "Start priority"
msgstr "Стартовий пріоритет"
msgid "Starting configuration apply…"
-msgstr "ЗаÑтоÑовуєтьÑÑ Ñтартова конфігураціÑ…"
+msgstr "Розпочато заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—â€¦"
msgid "Starting wireless scan..."
msgstr "Розпочато ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð±ÐµÐ·Ð´Ñ€Ð¾Ñ‚Ð¾Ð²Ð¸Ñ… мереж..."
@@ -3446,7 +3470,7 @@ msgid ""
"\"Proceed\" below to start the flash procedure."
msgstr ""
"Образ завантажено. Ðижче наведено контрольну Ñуму та розмір файлу. "
-"ПорівнÑйте Ñ—Ñ… з вихідним файлом, шоб переконатиÑÑ Ð² ціліÑноÑÑ‚Ñ– даних.<br /> "
+"ПорівнÑйте Ñ—Ñ… з вихідним файлом, щоб переконатиÑÑ Ð² ціліÑноÑÑ‚Ñ– даних.<br /> "
"ÐатиÑніть \"Продовжити\", щоб розпочати процедуру прошиваннÑ."
msgid "The following changes have been reverted"
@@ -3549,7 +3573,7 @@ msgid ""
"There is no password set on this router. Please configure a root password to "
"protect the web interface and enable SSH."
msgstr ""
-"Цей маршрутизатор не має паролÑ. Ð’Ñтановіть пароль, шоб захиÑтити веб-"
+"Цей маршрутизатор не має паролÑ. Ð’Ñтановіть пароль, щоб захиÑтити веб-"
"Ñ–Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñ– увімкнути SSH."
msgid "This IPv4 address of the relay"
@@ -3944,7 +3968,7 @@ msgstr "Очікуємо, доки зміни наберуть чинноÑÑ‚Ñ–.
msgid "Waiting for command to complete..."
msgstr "Очікуємо Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr "Чекаємо на заÑтоÑÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ—â€¦ %d c"
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/vi/base.po b/modules/luci-base/po/vi/base.po
index 6451853bb4..cdf3d6be46 100644
--- a/modules/luci-base/po/vi/base.po
+++ b/modules/luci-base/po/vi/base.po
@@ -574,6 +574,12 @@ msgstr "Bá» qua"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "chuá»—i"
@@ -668,7 +674,7 @@ msgstr "Cấu hình"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
+msgid "Configuration files will be kept"
msgstr ""
msgid "Configuration has been applied."
@@ -1276,6 +1282,9 @@ msgstr ""
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1434,6 +1443,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "Äịa chỉ IP"
@@ -1479,6 +1491,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr ""
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr ""
@@ -2008,6 +2023,9 @@ msgstr "Chế độ"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "Thiết bị modem"
@@ -2192,9 +2210,6 @@ msgstr ""
msgid "Not connected"
msgstr ""
-msgid "Note: Configuration files will be erased."
-msgstr ""
-
msgid "Note: interface name length"
msgstr ""
@@ -2890,6 +2905,12 @@ msgid "See \"mount\" manpage for details"
msgstr ""
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr ""
@@ -3669,7 +3690,7 @@ msgstr ""
msgid "Waiting for command to complete..."
msgstr ""
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
diff --git a/modules/luci-base/po/zh-cn/base.po b/modules/luci-base/po/zh-cn/base.po
index 888ceca934..57e2b07ec7 100644
--- a/modules/luci-base/po/zh-cn/base.po
+++ b/modules/luci-base/po/zh-cn/base.po
@@ -1,7 +1,15 @@
+#
+# Yangfl <mmyangfl@gmail.com>, 2018.
+#
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
-"Last-Translator: Hsing-Wang Liao <kuoruan@gmail.com>\n"
+"Last-Translator: Yangfl <mmyangfl@gmail.com>\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-08-07 14:59+0800\n"
+"X-Generator: Gtranslator 2.91.7\n"
msgid "%.1f dB"
msgstr "%.1f dB"
@@ -129,7 +137,7 @@ msgid "<abbr title=\"Media Access Control\">MAC</abbr>-Address"
msgstr "<abbr title=\"Media Access Control\">MAC</abbr> 地å€"
msgid "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
-msgstr ""
+msgstr "<abbr title=\"The DHCP Unique Identifier\">DUID</abbr>"
msgid ""
"<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
@@ -315,7 +323,7 @@ msgid ""
"Always use 40MHz channels even if the secondary channel overlaps. Using this "
"option does not comply with IEEE 802.11n-2009!"
msgstr ""
-"å³ä½¿è¾…助信é“é‡å ï¼Œä¹Ÿå§‹ç»ˆä½¿ç”¨ 40MHz ä¿¡é“。使用此选项ä¸ç¬¦åˆIEEE 802.11n-2009ï¼"
+"å³ä½¿è¾…助信é“é‡å ï¼Œä¹Ÿå§‹ç»ˆä½¿ç”¨ 40MHz ä¿¡é“。使用此选项ä¸ç¬¦åˆ IEEE 802.11n-2009ï¼"
msgid "Annex"
msgstr "Annex"
@@ -575,6 +583,12 @@ msgstr "å–消"
msgid "Category"
msgstr "分类"
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "链"
@@ -647,10 +661,10 @@ msgid ""
msgstr "在给定时间(秒)åŽå…³é—­éžæ´»åŠ¨é“¾æŽ¥ï¼Œ0 为ä¿æŒè¿žæŽ¥"
msgid "Close list..."
-msgstr "关闭列表..."
+msgstr "关闭列表…"
msgid "Collecting data..."
-msgstr "正在收集数æ®..."
+msgstr "正在收集数æ®â€¦"
msgid "Command"
msgstr "命令"
@@ -674,8 +688,8 @@ msgstr "é…ç½®"
msgid "Configuration failed"
msgstr "é…置失败"
-msgid "Configuration files will be kept."
-msgstr "é…置文件将被ä¿ç•™ã€‚"
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr "é…置已应用。"
@@ -872,13 +886,13 @@ msgid "Device Configuration"
msgstr "设备é…ç½®"
msgid "Device is rebooting..."
-msgstr "设备正在é‡å¯..."
+msgstr "设备正在é‡å¯â€¦"
msgid "Device unreachable!"
msgstr "无法连接到设备"
msgid "Device unreachable! Still waiting for device..."
-msgstr "无法连接到设备ï¼ä»æ—§ç­‰å¾…设备..."
+msgstr "无法连接到设备ï¼ä»æ—§ç­‰å¾…设备…"
msgid "Diagnostics"
msgstr "网络诊断"
@@ -915,7 +929,7 @@ msgid "Disabled (default)"
msgstr "å·²ç¦ç”¨ï¼ˆé»˜è®¤ï¼‰"
msgid "Disassociate On Low Acknowledgement"
-msgstr "在 Low Acknowledgement 时断开连接"
+msgstr "在低 Ack 应答时断开连接"
msgid "Discard upstream RFC1918 responses"
msgstr "丢弃 RFC1918 上行å“应数æ®"
@@ -1042,7 +1056,7 @@ msgid ""
"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
"snooping"
msgstr ""
-"å¯ç”¨ <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> 窥探"
+"å¯ç”¨ <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> 嗅探"
msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
msgstr "å¼€å¯ <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
@@ -1134,7 +1148,7 @@ msgid "Enter custom values"
msgstr "输入自定义值"
msgid "Erasing..."
-msgstr "擦除中..."
+msgstr "擦除中…"
msgid "Error"
msgstr "错误"
@@ -1192,7 +1206,7 @@ msgid "FT protocol"
msgstr "FT åè®®"
msgid "Failed to confirm apply within %ds, waiting for rollback…"
-msgstr "在 %d 秒内确认应用失败,等待回滚..."
+msgstr "在 %d 秒内确认应用失败,等待回滚…"
msgid "File"
msgstr "文件"
@@ -1254,7 +1268,7 @@ msgid "Flash Firmware"
msgstr "刷新固件"
msgid "Flash image..."
-msgstr "刷写固件..."
+msgstr "刷写固件…"
msgid "Flash new firmware image"
msgstr "刷写新的固件"
@@ -1263,7 +1277,7 @@ msgid "Flash operations"
msgstr "刷新æ“作"
msgid "Flashing..."
-msgstr "刷写中..."
+msgstr "正在刷写…"
msgid "Force"
msgstr "强制"
@@ -1286,6 +1300,9 @@ msgstr "强制 TKIP 和 CCMP(AES)"
msgid "Force link"
msgstr "强制链路"
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr "强制使用 NAT-T"
@@ -1372,7 +1389,7 @@ msgid "Global network options"
msgstr "全局网络选项"
msgid "Go to password configuration..."
-msgstr "跳转到密ç é…置页..."
+msgstr "跳转到密ç é…置页…"
msgid "Go to relevant configuration page"
msgstr "跳转到相关的é…置页é¢"
@@ -1444,6 +1461,9 @@ msgstr "IKE DH 组"
msgid "IP Addresses"
msgstr "IP 地å€"
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IP 地å€"
@@ -1489,6 +1509,9 @@ msgstr "IPv4 地å€å‰ç¼€"
msgid "IPv4 prefix length"
msgstr "IPv4 地å€å‰ç¼€é•¿åº¦"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4 地å€"
@@ -1641,7 +1664,7 @@ msgid "Install package %q"
msgstr "安装软件包 %q"
msgid "Install protocol extensions..."
-msgstr "安装扩展åè®®..."
+msgstr "安装扩展å议…"
msgid "Installed packages"
msgstr "已安装软件包"
@@ -1659,7 +1682,7 @@ msgid "Interface Overview"
msgstr "接å£æ€»è§ˆ"
msgid "Interface is reconnecting..."
-msgstr "正在é‡æ–°è¿žæŽ¥æŽ¥å£..."
+msgstr "正在é‡æ–°è¿žæŽ¥æŽ¥å£â€¦"
msgid "Interface name"
msgstr "接å£å称"
@@ -2026,6 +2049,9 @@ msgstr "模å¼"
msgid "Model"
msgstr "主机型å·"
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "调制解调器节点"
@@ -2134,7 +2160,7 @@ msgid "Network without interfaces."
msgstr "无接å£çš„网络。"
msgid "Next »"
-msgstr "下一步 »"
+msgstr "å‰è¿› »"
msgid "No DHCP Server configured for this interface"
msgstr "本接å£æœªé…ç½® DHCP æœåŠ¡å™¨"
@@ -2173,7 +2199,7 @@ msgid "No rules in this chain"
msgstr "本链没有规则"
msgid "No scan results available yet..."
-msgstr "还没有å¯ç”¨çš„扫æ结果..."
+msgstr "还没有å¯ç”¨çš„扫æ结果…"
msgid "No zone assigned"
msgstr "未指定区域"
@@ -2208,9 +2234,6 @@ msgstr "未关è”"
msgid "Not connected"
msgstr "未连接"
-msgid "Note: Configuration files will be erased."
-msgstr "注æ„:é…置文件将被删除。"
-
msgid "Note: interface name length"
msgstr "注æ„:接å£å称长度"
@@ -2270,7 +2293,7 @@ msgid "One or more required fields have no value!"
msgstr "一个或多个必选项值为空ï¼"
msgid "Open list..."
-msgstr "打开列表..."
+msgstr "打开列表……"
msgid "OpenConnect (CISCO AnyConnect)"
msgstr "OpenConnect (CISCO AnyConnect)"
@@ -2606,7 +2629,8 @@ msgstr "è´¨é‡"
msgid ""
"Query all available upstream <abbr title=\"Domain Name System\">DNS</abbr> "
"servers"
-msgstr "查询所有å¯ç”¨çš„上游 <abbr title=\"Domain Name System\">DNS</abbr> æœåŠ¡å™¨"
+msgstr ""
+"查询所有å¯ç”¨çš„上游 <abbr title=\"Domain Name System\">DNS</abbr> æœåŠ¡å™¨"
msgid "R0 Key Lifetime"
msgstr "R0 密钥生存期"
@@ -2664,8 +2688,8 @@ msgid ""
"Really delete this wireless network? The deletion cannot be undone! You "
"might lose access to this device if you are connected via this network."
msgstr ""
-"确定è¦åˆ é™¤æ­¤æ— çº¿ç½‘络?删除æ“作无法撤销ï¼è‹¥æ‚¨åˆ é™¤æ­¤æ— çº¿ç½‘络,å¯èƒ½å¯¼è‡´æ— æ³•å†è®¿é—®"
-"此设备。"
+"确定è¦åˆ é™¤æ­¤æ— çº¿ç½‘络?删除æ“作无法撤销ï¼è‹¥æ‚¨åˆ é™¤æ­¤æ— çº¿ç½‘络,å¯èƒ½å¯¼è‡´æ— æ³•å†è®¿"
+"问此设备。"
msgid "Really reset all changes?"
msgstr "确定è¦æ”¾å¼ƒæ‰€æœ‰æ›´æ”¹ï¼Ÿ"
@@ -2698,7 +2722,7 @@ msgid "Reboot"
msgstr "é‡å¯"
msgid "Rebooting..."
-msgstr "é‡å¯ä¸­..."
+msgstr "正在é‡å¯â€¦"
msgid "Reboots the operating system of your device"
msgstr "é‡å¯æ‚¨è®¾å¤‡ä¸Šçš„系统"
@@ -2829,7 +2853,7 @@ msgid "Revert request failed with status <code>%h</code>"
msgstr "æ¢å¤è¯·æ±‚å¤±è´¥ï¼ŒçŠ¶æ€ <code>%h</code>"
msgid "Reverting configuration…"
-msgstr "正在æ¢å¤é…ç½®..."
+msgstr "正在æ¢å¤é…置…"
msgid "Root"
msgstr "Root"
@@ -2915,6 +2939,12 @@ msgid "See \"mount\" manpage for details"
msgstr "è¯¦å‚ \"mount\" è”机帮助"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr "定时å‘é€ LCP å“应(秒),仅在结åˆäº†æ•…障阈值时有效"
@@ -3063,10 +3093,10 @@ msgid "Start priority"
msgstr "å¯åŠ¨ä¼˜å…ˆçº§"
msgid "Starting configuration apply…"
-msgstr "开始应用é…ç½®..."
+msgstr "开始应用é…置…"
msgid "Starting wireless scan..."
-msgstr "正在å¯åŠ¨æ— çº¿æ‰«æ..."
+msgstr "正在å¯åŠ¨æ— çº¿æ‰«æ…"
msgid "Startup"
msgstr "å¯åŠ¨é¡¹"
@@ -3144,7 +3174,7 @@ msgid "Sync with browser"
msgstr "åŒæ­¥æµè§ˆå™¨æ—¶é—´"
msgid "Synchronizing..."
-msgstr "åŒæ­¥ä¸­..."
+msgstr "正在åŒæ­¥â€¦"
msgid "System"
msgstr "系统"
@@ -3236,9 +3266,9 @@ msgid ""
"or revert all pending changes to keep the currently working configuration "
"state."
msgstr ""
-"åœ¨åº”ç”¨æŒ‚èµ·çš„æ›´æ”¹åŽ %d 秒内无法连接到此设备,出于安全原因导致é…置回滚。如果您认"
-"为é…置的更改是正确的,请执行强制应用。或者您å¯ä»¥åœ¨å†æ¬¡å°è¯•åº”用之å‰è§£é™¤"
-"此警告并编辑é…置,或者æ¢å¤æ‰€æœ‰æŒ‚起的更改以ä¿æŒå½“å‰æ­£åœ¨å·¥ä½œçš„é…置状æ€ã€‚"
+"åœ¨åº”ç”¨æŒ‚èµ·çš„æ›´æ”¹åŽ %d 秒内无法连接到此设备,出于安全原因导致é…置回滚。如果您"
+"认为é…置的更改是正确的,请执行强制应用。或者您å¯ä»¥åœ¨å†æ¬¡å°è¯•åº”用之å‰è§£é™¤æ­¤è­¦"
+"告并编辑é…置,或者æ¢å¤æ‰€æœ‰æŒ‚起的更改以ä¿æŒå½“å‰æ­£åœ¨å·¥ä½œçš„é…置状æ€ã€‚"
msgid ""
"The device file of the memory or partition (<abbr title=\"for example\">e.g."
@@ -3278,10 +3308,10 @@ msgstr "本机的硬件ä¸æ”¯æŒå¤š SSID,如果继续,现有é…置将被替æ
msgid ""
"The length of the IPv4 prefix in bits, the remainder is used in the IPv6 "
"addresses."
-msgstr "IPv4 å‰ç¼€é•¿åº¦ï¼ˆbit),其余的用在 IPv6 地å€ã€‚"
+msgstr "IPv4 å‰ç¼€é•¿åº¦ï¼ˆä½ï¼‰ï¼Œå…¶ä½™çš„用在 IPv6 地å€ã€‚"
msgid "The length of the IPv6 prefix in bits"
-msgstr "IPv6 å‰ç¼€é•¿åº¦ï¼ˆbit)"
+msgstr "IPv6 å‰ç¼€é•¿åº¦ï¼ˆä½ï¼‰"
msgid "The local IPv4 address over which the tunnel is created (optional)."
msgstr "所创建隧é“的本地 IPv4 地å€ï¼ˆå¯é€‰ï¼‰ã€‚"
@@ -3316,7 +3346,7 @@ msgid ""
"address of your computer to reach the device again, depending on your "
"settings."
msgstr ""
-"正在刷新系统...<br />切勿关闭电æº! DO NOT POWER OFF THE DEVICE!<br />等待数分"
+"正在刷写系统…<br />切勿关闭电æºï¼ DO NOT POWER OFF THE DEVICE!<br />等待数分"
"é’ŸåŽå³å¯å°è¯•é‡æ–°è¿žæŽ¥åˆ°è·¯ç”±ã€‚您å¯èƒ½éœ€è¦æ›´æ”¹è®¡ç®—机的 IP 地å€ä»¥é‡æ–°è¿žæŽ¥ã€‚"
msgid ""
@@ -3620,7 +3650,7 @@ msgid ""
msgstr ""
"使用“添加â€æŒ‰é’®æ¥å¢žåŠ æ–°çš„租约æ¡ç›®ã€‚“IPv4 地å€â€å’Œâ€œä¸»æœºåâ€å­—段的值将被固定分é…"
"给“MAC 地å€â€å­—段标识的主机,“租期â€æ˜¯ä¸€ä¸ªå¯é€‰å­—段,å¯ä¸ºæ¯ä¸ªä¸»æœºå•ç‹¬è®¾å®š DHCP "
-"租期的时长,例如:12hã€3dã€inifinite,分别表示 12 å°æ—¶ã€3 天ã€æ°¸ä¹…。"
+"租期的时长,例如:12hã€3dã€infinite,分别表示 12 å°æ—¶ã€3 天ã€æ°¸ä¹…。"
msgid "Used"
msgstr "已用"
@@ -3715,16 +3745,16 @@ msgstr ""
"点 Ad-Hoc 模å¼ï¼‰ã€‚"
msgid "Waiting for changes to be applied..."
-msgstr "正在应用更改..."
+msgstr "正在应用更改…"
msgid "Waiting for command to complete..."
-msgstr "等待命令执行完æˆ..."
+msgstr "等待命令执行完æˆâ€¦"
-msgid "Waiting for configuration to get applied… %ds"
-msgstr "等待应用é…ç½®... %d 秒"
+msgid "Waiting for configuration to be applied… %ds"
+msgstr "等待应用é…置… %d 秒"
msgid "Waiting for device..."
-msgstr "等待设备..."
+msgstr "等待设备…"
msgid "Warning"
msgstr "警告"
@@ -3762,10 +3792,10 @@ msgid "Wireless is disabled"
msgstr "无线未开å¯"
msgid "Wireless is not associated"
-msgstr "无线未未关è”"
+msgstr "无线未关è”"
msgid "Wireless is restarting..."
-msgstr "无线é‡å¯ä¸­..."
+msgstr "无线é‡å¯ä¸­â€¦"
msgid "Wireless network is disabled"
msgstr "无线网络已ç¦ç”¨"
@@ -3797,7 +3827,7 @@ msgid ""
"or Safari."
msgstr ""
"您的 IE æµè§ˆå™¨å¤ªè€äº†ï¼Œæ— æ³•æ­£å¸¸æ˜¾ç¤ºè¿™ä¸ªé¡µé¢ï¼è¯·æ›´æ–°åˆ° IE7 åŠä»¥ä¸Šæˆ–使用其他æµè§ˆ"
-"器,例如:Chromeã€Firefoxã€Operaã€Safari。"
+"器,如 Firefoxã€Operaã€Safari。"
msgid "any"
msgstr "ä»»æ„"
@@ -3873,13 +3903,13 @@ msgid "kbit/s"
msgstr "kbit/s"
msgid "local <abbr title=\"Domain Name System\">DNS</abbr> file"
-msgstr "本地 <abbr title=\"Domain Name Syste\">DNS</abbr> 解æžæ–‡ä»¶"
+msgstr "本地 <abbr title=\"Domain Name System\">DNS</abbr> 解æžæ–‡ä»¶"
msgid "minutes"
msgstr "分钟"
msgid "mixed WPA/WPA2"
-msgstr "mixed WPA/WPA2"
+msgstr "æ··åˆ WPA/WPA2"
msgid "no"
msgstr "å¦"
@@ -3921,13 +3951,13 @@ msgid "server mode"
msgstr "æœåŠ¡å™¨æ¨¡å¼"
msgid "stateful-only"
-msgstr "有状æ€çš„"
+msgstr "有状æ€"
msgid "stateless"
-msgstr "无状æ€çš„"
+msgstr "无状æ€"
msgid "stateless + stateful"
-msgstr "无状æ€çš„ + 有状æ€çš„"
+msgstr "æ— çŠ¶æ€ + 有状æ€"
msgid "tagged"
msgstr "已标记"
@@ -3956,6 +3986,12 @@ msgstr "是"
msgid "« Back"
msgstr "« åŽé€€"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "é…置文件将被ä¿ç•™ã€‚"
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "注æ„:é…置文件将被删除。"
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
diff --git a/modules/luci-base/po/zh-tw/base.po b/modules/luci-base/po/zh-tw/base.po
index 579d52656a..97e79922d0 100644
--- a/modules/luci-base/po/zh-tw/base.po
+++ b/modules/luci-base/po/zh-tw/base.po
@@ -579,6 +579,12 @@ msgstr "å–消"
msgid "Category"
msgstr ""
+msgid "Caution: Configuration files will be erased"
+msgstr ""
+
+msgid "Caution: System upgrade will be forced"
+msgstr ""
+
msgid "Chain"
msgstr "éˆ"
@@ -677,8 +683,8 @@ msgstr "設定"
msgid "Configuration failed"
msgstr ""
-msgid "Configuration files will be kept."
-msgstr "設定檔將被存檔"
+msgid "Configuration files will be kept"
+msgstr ""
msgid "Configuration has been applied."
msgstr ""
@@ -1287,6 +1293,9 @@ msgstr "強制TKIP+CCMP (AES)加密"
msgid "Force link"
msgstr ""
+msgid "Force upgrade"
+msgstr ""
+
msgid "Force use of NAT-T"
msgstr ""
@@ -1443,6 +1452,9 @@ msgstr ""
msgid "IP Addresses"
msgstr ""
+msgid "IP Protocol"
+msgstr ""
+
msgid "IP address"
msgstr "IPä½å€"
@@ -1488,6 +1500,9 @@ msgstr ""
msgid "IPv4 prefix length"
msgstr "IPv4å‰ç¶´é•·åº¦"
+msgid "IPv4+IPv6"
+msgstr ""
+
msgid "IPv4-Address"
msgstr "IPv4-ä½å€"
@@ -2015,6 +2030,9 @@ msgstr "模å¼"
msgid "Model"
msgstr ""
+msgid "Modem default"
+msgstr ""
+
msgid "Modem device"
msgstr "數據機設備"
@@ -2197,9 +2215,6 @@ msgstr "尚未關è¯"
msgid "Not connected"
msgstr "尚未連線"
-msgid "Note: Configuration files will be erased."
-msgstr "注æ„:設定檔將被刪除."
-
msgid "Note: interface name length"
msgstr ""
@@ -2893,6 +2908,12 @@ msgid "See \"mount\" manpage for details"
msgstr "查看\"mount\"主é ç²å–進階資訊"
msgid ""
+"Select 'Force upgrade' to flash the image even if the image format check "
+"fails. Use only if you are sure that the firmware is correct and meant for "
+"your device!"
+msgstr ""
+
+msgid ""
"Send LCP echo requests at the given interval in seconds, only effective in "
"conjunction with failure threshold"
msgstr "傳é€LCP呼å«è«‹æ±‚在這個給予的秒數間隔內, 僅影響關è¯åˆ°å¤±æ•—門檻"
@@ -3701,7 +3722,7 @@ msgstr "等待修改被啟用..."
msgid "Waiting for command to complete..."
msgstr "等待完整性指令..."
-msgid "Waiting for configuration to get applied… %ds"
+msgid "Waiting for configuration to be applied… %ds"
msgstr ""
msgid "Waiting for device..."
@@ -3935,6 +3956,12 @@ msgstr "是的"
msgid "« Back"
msgstr "« 倒退"
+#~ msgid "Configuration files will be kept."
+#~ msgstr "設定檔將被存檔"
+
+#~ msgid "Note: Configuration files will be erased."
+#~ msgstr "注æ„:設定檔將被刪除."
+
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
diff --git a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
index 153615b58a..46d2e36c32 100644
--- a/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
+++ b/modules/luci-mod-admin-full/luasrc/controller/admin/system.lua
@@ -35,6 +35,7 @@ function index()
entry({"admin", "system", "flashops"}, call("action_flashops"), _("Backup / Flash Firmware"), 70)
entry({"admin", "system", "flashops", "reset"}, post("action_reset"))
entry({"admin", "system", "flashops", "backup"}, post("action_backup"))
+ entry({"admin", "system", "flashops", "backupmtdblock"}, post("action_backupmtdblock"))
entry({"admin", "system", "flashops", "backupfiles"}, form("admin_system/backupfiles"))
-- call() instead of post() due to upload handling!
@@ -269,15 +270,17 @@ function action_sysupgrade()
--
-- Initiate firmware flash
--
- local step = tonumber(http.formvalue("step") or 1)
+ local step = tonumber(http.formvalue("step")) or 1
if step == 1 then
- if image_supported(image_tmp) then
+ local force = http.formvalue("force")
+ if image_supported(image_tmp) or force then
luci.template.render("admin_system/upgrade", {
checksum = image_checksum(image_tmp),
sha256ch = image_sha256_checksum(image_tmp),
storage = storage_size(),
size = (fs.stat(image_tmp, "size") or 0),
- keep = (not not http.formvalue("keep"))
+ keep = (not not http.formvalue("keep")),
+ force = (not not http.formvalue("force"))
})
else
fs.unlink(image_tmp)
@@ -287,17 +290,19 @@ function action_sysupgrade()
image_invalid = true
})
end
+
--
-- Start sysupgrade flash
--
elseif step == 2 then
local keep = (http.formvalue("keep") == "1") and "" or "-n"
+ local force = (http.formvalue("force") == "1") and "-F" or ""
luci.template.render("admin_system/applyreboot", {
title = luci.i18n.translate("Flashing..."),
msg = luci.i18n.translate("The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a few minutes before you try to reconnect. It might be necessary to renew the address of your computer to reach the device again, depending on your settings."),
- addr = (#keep > 0) and "192.168.1.1" or nil
+ addr = (#keep > 0) and (#force > 0) and "192.168.1.1" or nil
})
- fork_exec("sleep 1; killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %q" %{ keep, image_tmp })
+ fork_exec("sleep 1; killall dropbear uhttpd; sleep 1; /sbin/sysupgrade %s %s %q" %{ keep, force, image_tmp })
end
end
@@ -314,6 +319,23 @@ function action_backup()
luci.ltn12.pump.all(reader, luci.http.write)
end
+function action_backupmtdblock()
+ local http = require "luci.http"
+ local mv = http.formvalue("mtdblockname")
+ local m, s, n = mv:match('^([^%s]+)/([^%s]+)/([^%s]+)')
+
+ local reader = ltn12_popen("dd if=/dev/mtd%s conv=fsync,notrunc 2>/dev/null" % n)
+
+ luci.http.header(
+ 'Content-Disposition', 'attachment; filename="backup-%s-%s-%s.bin"' %{
+ luci.sys.hostname(), m,
+ os.date("%Y-%m-%d")
+ })
+
+ luci.http.prepare_content("application/octet-stream")
+ luci.ltn12.pump.all(reader, luci.http.write)
+end
+
function action_restore()
local fs = require "nixio.fs"
local http = require "luci.http"
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
index 06bce01fc4..8be354b448 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -53,7 +53,7 @@ local function get_ifstate(name, option)
m.uci:foreach("luci", "ifstate", function (s)
if s.interface == name then
- val = m.uci:get("luci", s[".name"], option)
+ val = s[option]
return false
end
end)
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
index 3e46628d3f..d79b3c4704 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua
@@ -17,7 +17,7 @@ local update_interfaces = function(old_ifname, new_ifname)
local info = { }
m.uci:foreach("network", "interface", function(section)
- local old_ifnames = m.uci:get("network", section[".name"], "ifname")
+ local old_ifnames = section.ifname
local new_ifnames = { }
local cur_ifname
local changed = false
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index a56d904d9f..29a03f2554 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -237,10 +237,10 @@
'<%:Data Rate%>', '%s/s / %s/s'.format(info.dsl.data_rate_down_s, info.dsl.data_rate_up_s),
'<%:Max. Attainable Data Rate (ATTNDR)%>', '%s/s / %s/s'.format(info.dsl.max_data_rate_down_s, info.dsl.max_data_rate_up_s),
'<%:Latency%>', '%s / %s'.format(info.dsl.latency_num_down, info.dsl.latency_num_up),
- '<%:Line Attenuation (LATN)%>', '%d dB / %d dB'.format(info.dsl.line_attenuation_down, info.dsl.line_attenuation_up),
- '<%:Signal Attenuation (SATN)%>', '%d dB / %d dB'.format(info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up),
- '<%:Noise Margin (SNR)%>', '%d dB / %d dB'.format(info.dsl.noise_margin_down, info.dsl.noise_margin_up),
- '<%:Aggregate Transmit Power(ACTATP)%>', '%d dB / %d dB'.format(info.dsl.actatp_down, info.dsl.actatp_up),
+ '<%:Line Attenuation (LATN)%>', '%.1f dB / %.1f dB'.format(info.dsl.line_attenuation_down, info.dsl.line_attenuation_up),
+ '<%:Signal Attenuation (SATN)%>', '%.1f dB / %.1f dB'.format(info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up),
+ '<%:Noise Margin (SNR)%>', '%.1f dB / %.1f dB'.format(info.dsl.noise_margin_down, info.dsl.noise_margin_up),
+ '<%:Aggregate Transmit Power(ACTATP)%>', '%.1f dB / %.1f dB'.format(info.dsl.actatp_down, info.dsl.actatp_up),
'<%:Forward Error Correction Seconds (FECS)%>', '%d / %d'.format(info.dsl.errors_fec_near, info.dsl.errors_fec_far),
'<%:Errored seconds (ES)%>', '%d / %d'.format(info.dsl.errors_es_near, info.dsl.errors_es_far),
'<%:Severely Errored Seconds (SES)%>', '%d / %d'.format(info.dsl.errors_ses_near, info.dsl.errors_ses_far),
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
index e722a48096..e235bd4679 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/applyreboot.htm
@@ -6,36 +6,48 @@
<html>
<head>
- <title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
+ <title><%=luci.sys.hostname()%> - <%= title or translate("Rebooting...") %></title>
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
<script type="text/javascript">//<![CDATA[
var interval = window.setInterval(function() {
var img = new Image();
-
+ var target = ('https:' == document.location.protocol ? 'https://' : 'http://') + <%=addr and "'%s'" % addr or "window.location.host"%>;
+
img.onload = function() {
window.clearInterval(interval);
- location.href = ('https:' == document.location.protocol ? 'https://' : 'http://') + '<%=addr or luci.http.getenv("SERVER_NAME")%>/';
+ window.location.replace(target);
};
-
- img.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + '<%=addr or luci.http.getenv("SERVER_NAME")%><%=resource%>/icons/loading.gif?' + Math.random();
+
+ img.src = target + '<%=resource%>/icons/loading.gif?' + Math.random();
+
}, 5000);
//]]></script>
</head>
<body>
- <div id="maincontainer">
- <div id="maincontent">
- <h2 name="content"><%:System%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></h2>
- <fieldset class="cbi-section">
- <p>
- <% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>
- </p>
- <p>
- <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
- <%:Waiting for changes to be applied...%>
- </p>
- </fieldset>
+ <header>
+ <div class="fill">
+ <div class="container">
+ <p class="brand"><%=luci.sys.hostname() or "?"%></p>
+ </div>
+ </div>
+ </header>
+ &#160;
+ <div class="main">
+ <div id="maincontainer">
+ <div id="maincontent" class="container">
+ <h2 name="content" id="applyreboot-container" ><%:System%> - <%= title or translate("Rebooting...") %></h2>
+ <div class="cbi-section" id="applyreboot-section">
+ <div>
+ <%= msg or translate("Changes applied.") %>
+ </div>
+ <div>
+ <img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
+ <%:Waiting for changes to be applied...%>
+ </div>
+ </div>
+ </div>
</div>
</div>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
index ee9c2f8fd3..8204d38e34 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/flashops.htm
@@ -20,7 +20,7 @@
<form class="inline" method="post" action="<%=url('admin/system/flashops/backup')%>">
<input type="hidden" name="token" value="<%=token%>" />
<div class="cbi-value<% if not reset_avail then %> cbi-value-last<% end %>">
- <label class="cbi-value-title" for="image"><%:Download backup%>:</label>
+ <label class="cbi-value-title" for="image"><%:Download backup%></label>
<div class="cbi-value-field">
<input class="cbi-button cbi-button-action important" type="submit" name="backup" value="<%:Generate archive%>" />
</div>
@@ -35,7 +35,7 @@
<form class="inline" method="post" action="<%=url('admin/system/flashops/reset')%>">
<input type="hidden" name="token" value="<%=token%>" />
<div class="cbi-value cbi-value-last">
- <label class="cbi-value-title"><%:Reset to defaults%>:</label>
+ <label class="cbi-value-title"><%:Reset to defaults%></label>
<div class="cbi-value-field">
<input onclick="return confirm('<%:Really reset all changes?%>')" class="cbi-button cbi-button-reset" type="submit" name="reset" value="<%:Perform reset%>" />
</div>
@@ -44,7 +44,7 @@
<% end %>
<form class="inline" method="post" action="<%=url('admin/system/flashops/restore')%>" enctype="multipart/form-data">
<div class="cbi-value cbi-value-last">
- <label class="cbi-value-title" for="archive"><%:Restore backup%>:</label>
+ <label class="cbi-value-title" for="archive"><%:Restore backup%></label>
<div class="cbi-value-field">
<input type="hidden" name="token" value="<%=token%>" />
<input type="file" name="archive" id="archive" />
@@ -59,6 +59,40 @@
<div class="cbi-section-error"><%:The backup archive does not appear to be a valid gzip file.%></div>
<% end %>
</div>
+
+ <% local mtds = require("luci.sys").mtds(); if #mtds > 0 then -%>
+ <h3><%:Save mtdblock contents%></h3>
+ <div class="cbi-section-descr"><%:Click "Save mtdblock" to download specified mtdblock file. (NOTE: THIS FEATURE IS FOR PROFESSIONALS! )%></div>
+ <div class="cbi-section-node">
+ <form class="inline" method="post" action="<%=url('admin/system/flashops/backupmtdblock')%>">
+ <input type="hidden" name="token" value="<%=token%>" />
+ <div class="cbi-value">
+ <label class="cbi-value-title" for="mtdblockname"><%:Choose mtdblock%></label>
+ <div class="cbi-value-field">
+ <select class="cbi-input-select" data-update="change" name="mtdblockname" id="mtdblockname">
+ <% for i, key in ipairs(mtds) do
+ if key and key.name ~= "rootfs_data" then -%>
+ <option<%=
+ attr("id", "mtdblockname-" .. key.name) ..
+ attr("value", key.name .. '/'.. key.size .. '/' .. i - 1) ..
+ attr("data-index", i) ..
+ ifattr(key.name == "linux" or key.name == "firmware", "selected", "selected")
+ %>><%=pcdata(key.name)%></option>
+ <% end
+ end -%>
+ </select>
+ </div>
+ </div>
+ <div class="cbi-value cbi-value-last<% if reset_avail then %> cbi-value-error<% end %>">
+ <label class="cbi-value-title" for="image"><%:Download mtdblock%></label>
+ <div class="cbi-value-field">
+ <input type="submit" class="cbi-button cbi-button-action important" value="<%:Save mtdblock%>" />
+ </div>
+ </div>
+ </form>
+ </div>
+ <% end %>
+
</div>
<div class="cbi-section">
@@ -69,22 +103,31 @@
<div class="cbi-section-descr"><%:Upload a sysupgrade-compatible image here to replace the running firmware. Check "Keep settings" to retain the current configuration (requires a compatible firmware image).%></div>
<div class="cbi-section-node">
<div class="cbi-value">
- <label class="cbi-value-title" for="keep"><%:Keep settings%>:</label>
+ <label class="cbi-value-title" for="keep"><%:Keep settings%></label>
<div class="cbi-value-field">
<input type="checkbox" name="keep" id="keep" checked="checked" />
</div>
</div>
+ <% if image_invalid then %>
+ <div class="cbi-value">
+ <label class="cbi-value-title" for="force"><%:Force upgrade%></label>
+ <div class="cbi-value-field">
+ <input type="checkbox" name="force" id="force" />
+ </div>
+ <div class="cbi-section-error">
+ <%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %>
+ <%:Select 'Force upgrade' to flash the image even if the image format check fails. Use only if you are sure that the firmware is correct and meant for your device! %>
+ </div>
+ </div>
+ <% end %>
<div class="cbi-value cbi-value-last<% if image_invalid then %> cbi-value-error<% end %>">
- <label class="cbi-value-title" for="image"><%:Image%>:</label>
+ <label class="cbi-value-title" for="image"><%:Image%></label>
<div class="cbi-value-field">
<input type="file" name="image" id="image" />
<input type="submit" class="cbi-button cbi-button-action important" value="<%:Flash image...%>" />
</div>
</div>
</div>
- <% if image_invalid then %>
- <div class="cbi-section-error"><%:The uploaded image file does not contain a supported format. Make sure that you choose the generic image format for your platform. %></div>
- <% end %>
</form>
<% else %>
<div class="cbi-section-descr"><%:Sorry, there is no sysupgrade support present; a new firmware image must be flashed manually. Please refer to the wiki for device specific install instructions.%></div>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
index 7175248dbb..597ddfd6bf 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_system/upgrade.htm
@@ -22,7 +22,7 @@
</p>
-<fieldset class="cbi-section">
+<div class="cbi-section">
<ul>
<li><%:Checksum%><br />
<%:MD5%>: <code><%=checksum%></code><br />
@@ -39,18 +39,24 @@
end
%></li>
<li><% if keep then %>
- <%:Configuration files will be kept.%>
+ <%:Configuration files will be kept%>
<% else %>
- <%:Note: Configuration files will be erased.%>
+ <%:Caution: Configuration files will be erased%>
<% end %></li>
+ <% if force then %>
+ <li>
+ <%:Caution: System upgrade will be forced%>
+ </li>
+ <% end %>
</ul>
-</fieldset>
+</div>
<div class="cbi-page-actions right">
<form class="inline" action="<%=REQUEST_URI%>" method="post">
<input type="hidden" name="token" value="<%=token%>" />
<input type="hidden" name="step" value="2" />
<input type="hidden" name="keep" value="<%=keep and "1" or ""%>" />
+ <input type="hidden" name="force" value="<%=force and "1" or ""%>" />
<input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" />
<input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" />
</form>
diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
index e05ccdece3..8a162c88b6 100644
--- a/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm
@@ -1,5 +1,5 @@
<%#
- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
+ Copyright 2010 Jo-Philipp Wich <jo@mein.io>
Licensed to the public under the Apache License 2.0.
-%>
@@ -17,65 +17,50 @@
<div class="uci-change-list"><%
local util = luci.util
- local ret = { }
+ local tpl = {
+ ["add-3"] = "<ins>uci add %0 <strong>%3</strong> # =%2</ins>",
+ ["set-3"] = "<ins>uci set %0.<strong>%2</strong></ins>=%3",
+ ["set-4"] = "<var><ins>uci set %0.%2.%3=<strong>%4</strong></ins></var>",
+ ["remove-2"] = "<del>uci del %0.<strong>%2</strong></del>",
+ ["remove-3"] = "<var><del>uci del %0.%2.<strong>%3</strong></del></var>",
+ ["order-3"] = "<var>uci reorder %0.%2=<strong>%3</strong></var>",
+ ["list-add-4"] = "<var><ins>uci add_list %0.%2.%3=<strong>%4</strong></ins></var>",
+ ["list-del-4"] = "<var><del>uci del_list %0.%2.%3=<strong>%4</strong></del></var>",
+ ["rename-3"] = "<var>uci rename %0.%2=<strong>%3</strong></var>",
+ ["rename-4"] = "<var>uci rename %0.%2.%3=<strong>%4</strong></var>"
+ }
- for r, tbl in pairs(changes) do
- for s, os in pairs(tbl) do
- -- section add
- if os['.type'] and os['.type'] ~= "" then
- ret[#ret+1] = "<ins>%s.%s=<strong>%s</strong>" %{ r, s, os['.type'] }
- for o, v in util.kspairs(os) do
- if o:sub(1,1) ~= "." then
- if type(v) == "table" then
- local i
- for i = 1, #v do
- ret[#ret+1] = "<br />%s.%s.%s+=<strong>%s</strong>"
- %{ r, s, o, util.pcdata(v[i]) }
- end
- elseif v ~= "" then
- ret[#ret+1] = "<br />%s.%s.%s=<strong>%s</strong>"
- %{ r, s, o, util.pcdata(v) }
- else
- ret[#ret+1] = "<br /><del>%s.%s.<strong>%s</strong></del>" %{ r, s, o }
- end
- end
- end
- ret[#ret+1] = "</ins><br />"
-
- -- section delete
- elseif os['.type'] and os['.type'] == "" then
- ret[#ret+1] = "<del>%s.<strong>%s</strong></del><br />" %{ r, s }
+ local conf, deltas
+ for conf, deltas in util.kspairs(changes) do
+ write("<h3># /etc/config/%s</h3>" % conf)
- -- modifications
- else
- ret[#ret+1] = "<var>%s.%s<br />" %{ r, s }
- for o, v in util.kspairs(os) do
- if o:sub(1,1) ~= "." then
- if v and #v > 0 then
- ret[#ret+1] = "<ins>"
- if type(v) == "table" then
- local i
- for i = 1, #v do
- ret[#ret+1] = "%s.%s.%s+=<strong>%s</strong><br />"
- %{ r, s, o, util.pcdata(v[i]) }
- end
+ local _, delta, added
+ for _, delta in pairs(deltas) do
+ local t = tpl["%s-%d" %{ delta[1], #delta }]
- else
- ret[#ret+1] = "%s.%s.%s=<strong>%s</strong><br />"
- %{ r, s, o, util.pcdata(v) }
- end
- ret[#ret+1] = "</ins>"
- else
- ret[#ret+1] = "<del>%s.%s.<strong>%s</strong><br /></del>" %{ r, s, o }
- end
+ write(t:gsub("%%(%d)", function(n)
+ if n == "0" then
+ return conf
+ elseif n == "2" then
+ if added and delta[2] == added[1] then
+ return "@%s[-1]" % added[2]
+ else
+ return delta[2]
end
+ elseif n == "4" then
+ return util.shellquote(delta[4])
+ else
+ return delta[tonumber(n)]
end
- ret[#ret+1] = "</var><br />"
+ end))
+
+ if delta[1] == "add" then
+ added = { delta[2], delta[3] }
end
end
- end
- write(table.concat(ret))
+ write("<br />")
+ end
%></div>
</div>
<%- end) %>
diff --git a/protocols/luci-proto-ipv6/Makefile b/protocols/luci-proto-ipv6/Makefile
index b28c8d5895..b0c8395e86 100644
--- a/protocols/luci-proto-ipv6/Makefile
+++ b/protocols/luci-proto-ipv6/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=Support for DHCPv6/6in4/6to4/6rd/DS-Lite
-LUCI_DEPENDS:=
+LUCI_DEPENDS:=@IPV6
PKG_LICENSE:=Apache-2.0
diff --git a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
index b258dfc598..318db7e774 100644
--- a/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
+++ b/protocols/luci-proto-ncm/luasrc/model/cbi/admin_network/proto_ncm.lua
@@ -19,16 +19,13 @@ local ipv6, delay, defaultroute, metric, peerdns, dns
device = section:taboption("general", Value, "device", translate("Modem device"))
device.rmempty = false
-local device_suggestions = nixio.fs.glob("/dev/cdc-wdm*")
- or nixio.fs.glob("/dev/ttyUSB*")
-
-if device_suggestions then
- local node
- for node in device_suggestions do
- device:value(node)
- end
+local dev
+for dev in nixio.fs.glob("/dev/ttyUSB*") do
+ device:value(dev)
+end
+for dev in nixio.fs.glob("/dev/cdc-wdm*") do
+ device:value(dev)
end
-
mode = section:taboption("general", Value, "mode", translate("Service Type"))
mode:value("", translate("Modem default"))
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
index 355d9b5b39..5f468bc14c 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
@@ -103,7 +103,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
- m:del(section, "keepalive")
+ m:set(section, "keepalive", "0")
end
end
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
index a5f76a38ad..004fd7ef67 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
@@ -109,7 +109,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
- m:del(section, "keepalive")
+ m:set(section, "keepalive", "0")
end
end
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
index 078b5ffe94..f785b7fb6f 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
@@ -103,7 +103,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
- m:del(section, "keepalive")
+ m:set(section, "keepalive", "0")
end
end
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua
index eca7bdd4d3..e53262b5dc 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pppossh.lua
@@ -105,7 +105,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
- m:del(section, "keepalive")
+ m:set(section, "keepalive", "0")
end
end
diff --git a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
index 462d7019f0..6a828efe96 100644
--- a/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ b/protocols/luci-proto-ppp/luasrc/model/cbi/admin_network/proto_pptp.lua
@@ -82,7 +82,7 @@ function keepalive_interval.write(self, section, value)
if f > 0 then
m:set(section, "keepalive", "%d %d" %{ f, i })
else
- m:del(section, "keepalive")
+ m:set(section, "keepalive", "0")
end
end
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index 0c158961d2..260f5e31cc 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -23,7 +23,7 @@ body {
padding: 5px;
}
-h1, h2, h3, h4, h5, h6, p, pre, a, abbr, acronym, code, del, em, img, q, s,
+h1, h2, h3, h4, h5, h6, p, pre, a, abbr, acronym, code, del, em, img, ins, q, s,
small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset,
form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td,
.table, .tbody, .tfoot, .thead, .tr, .th, .td {
@@ -598,6 +598,12 @@ textarea[readonly] {
cursor: default;
}
+select[readonly],
+textarea[readonly] {
+ pointer-events: auto;
+ cursor: auto;
+}
+
.cbi-optionals,
.cbi-section-create {
padding: 0 0 10px 10px;
@@ -1950,47 +1956,51 @@ div.cbi-value var,
}
.uci-change-list {
- font-family: monospace;
+ line-height: 170%;
+ white-space: pre;
}
+.uci-change-list del,
.uci-change-list ins,
-.uci-change-legend-label ins {
+.uci-change-list var,
+.uci-change-legend-label del,
+.uci-change-legend-label ins,
+.uci-change-legend-label var {
text-decoration: none;
- border: 1px solid #0f0;
- background-color: #cfc;
- display: block;
+ font-family: monospace;
+ font-style: normal;
+ border: 1px solid #ccc;
+ background: #eee;
padding: 2px;
+ display: block;
+ line-height: 15px;
+ margin-bottom: 1px;
+}
+
+.uci-change-list ins,
+.uci-change-legend-label ins {
+ border-color: #0f0;
+ background: #cfc;
}
.uci-change-list del,
.uci-change-legend-label del {
- text-decoration: none;
- border: 1px solid #f00;
- background-color: #fcc;
- display: block;
- font-style: normal;
- padding: 2px;
+ border-color: #f00;
+ background: #fcc;
}
.uci-change-list var,
.uci-change-legend-label var {
- text-decoration: none;
- border: 1px solid #ccc;
- background-color: #eee;
- display: block;
- font-style: normal;
- padding: 2px;
- line-height: 19px;
- white-space: pre;
+ border-color: #ccc;
+ background: #eee;
}
.uci-change-list var ins,
.uci-change-list var del {
- display: inline;
- /*border: none;*/
- white-space: pre;
- font-style: normal;
- padding: 0px;
+ display: inline-block;
+ border: none;
+ width: 100%;
+ padding: 0;
}
.uci-change-legend {
@@ -2010,14 +2020,23 @@ div.cbi-value var,
width: 10px;
height: 10px;
display: block;
+ position: relative;
}
.uci-change-legend-label var ins,
.uci-change-legend-label var del {
- line-height: 6px;
border: none;
+ position: absolute;
+ top: 2px;
+ left: 2px;
+ right: 2px;
+ bottom: 2px;
}
html body.apply-overlay-active {
height: calc(100vh - 63px);
}
+
+#applyreboot-section {
+ line-height: 300%;
+}
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index 6ad32efb47..4347f133a4 100644
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -136,12 +136,9 @@
if tree.nodes[category] and tree.nodes[category].ucidata then
local ucichanges = 0
+ local i, j
for i, j in pairs(require("luci.model.uci").cursor():changes()) do
- for k, l in pairs(j) do
- for m, n in pairs(l) do
- ucichanges = ucichanges + 1;
- end
- end
+ ucichanges = ucichanges + #j
end
if ucichanges > 0 then
diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
index d5e87ebef0..3e1b1cd2f1 100644
--- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
@@ -586,6 +586,10 @@ html #menubar a:visited.warning {
margin-right: 2em;
}
+#applyreboot-section {
+ line-height: 300%;
+}
+
.lang_de #submenu_admin_uci {
width: 12em;
}
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
index 01fef2110a..fa0316343b 100755..100644
--- a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -19,15 +19,20 @@
*/
/*
+ * Include custom css
+ */
+@import url("custom.css");
+
+/*
* Font generate by Icomoon<icomoon.io>
*/
@font-face {
font-family: 'icomoon';
- src: url('../fonts/font.eot');
- src: url('../fonts/font.eot') format('embedded-opentype'),
- url('../fonts/font.ttf') format('truetype'),
- url('../fonts/font.woff') format('woff'),
- url('../fonts/font.svg') format('svg');
+ src: url('fonts/font.eot');
+ src: url('fonts/font.eot') format('embedded-opentype'),
+ url('fonts/font.ttf') format('truetype'),
+ url('fonts/font.woff') format('woff'),
+ url('fonts/font.svg') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -255,7 +260,7 @@ footer > a {
width: calc(0% + 15rem);
height: 100%;
height: calc(100% - 4rem);
- background-color: white;
+ background-color: var(--menu-bg-color, #FFFFFF);
overflow-x: auto;
position: fixed;
}
@@ -281,18 +286,18 @@ footer > a {
}
header {
- background: #0099CC;
- color: white;
+ background: var(--header-bg, #0099CC);
+ color: var(--header-color, #FFFFFF);
}
-header > .container {
+header > .fill > .container {
margin-top: 0.5rem;
padding: 0.5rem 1rem 0 1rem;
}
-header > .container > .brand {
+header > .fill > .container > .brand {
font-size: 1.4rem;
- color: white;
+ color: var(--header-color, #FFFFFF);
text-decoration: none;
cursor: default;
vertical-align: text-bottom;
@@ -374,7 +379,7 @@ header > .container > .brand {
}
.main > .main-left > .nav > li a {
- color: #404040;
+ color: var(--menu-color, #404040);
display: block;
}
@@ -406,7 +411,7 @@ header > .container > .brand {
.main > .main-left > .nav > li:hover,
.main > .main-left > .nav > .slide > .menu:hover {
- background: #D4D4D4;
+ background: var(--submenu-bg-hover, #D4D4D4)
}
.main > .main-left > .nav > .slide:hover {
@@ -418,7 +423,7 @@ header > .container > .brand {
}
.main > .main-left > .nav > .slide > .slide-menu > .active {
- background-color: #0099CC;
+ background-color: var(--submenu-bg-hover-active, #0099CC);
}
.main > .main-left > .nav > .slide > .slide-menu > li > a {
@@ -431,7 +436,7 @@ header > .container > .brand {
}
.main > .main-left > .nav > .slide > .slide-menu > li:hover {
- background: #D4D4D4;
+ background: var(--submenu-bg-hover, #D4D4D4)
}
.main > .main-left > .nav > .slide > .slide-menu > .active:hover {
@@ -1226,7 +1231,7 @@ td > .ifacebadge,
min-height: 14rem;
padding: 0.8rem;
font-size: 0.8rem;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: monospace;
color: black;
}
@@ -1732,6 +1737,17 @@ body.lang_pl.node-main-login .cbi-value-title {
width: 12rem;
}
+/* applyreboot fix */
+
+#applyreboot-container {
+ margin: 2rem;
+}
+
+#applyreboot-section {
+ margin: 2rem;
+ line-height: 300%;
+}
+
@media screen and (max-width: 1600px) {
.main-left {
width: calc(0% + 13rem);
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css
new file mode 100644
index 0000000000..b32eb2af1b
--- /dev/null
+++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css
@@ -0,0 +1,9 @@
+
+:root {
+ --header-bg: #0099CC;
+ --header-color: #FFFFFF;
+ --menu-bg-color: #FFFFFF;
+ --menu-color: #404040;
+ --submenu-bg-hover: #D4D4D4;
+ --submenu-bg-hover-active: #0099CC;
+}
diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
index f97db25751..c070b1a617 100644
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -160,13 +160,9 @@
-- calculate the number of unsaved changes
if tree.nodes[category] and tree.nodes[category].ucidata then
local ucichanges = 0
-
+ local i, j
for i, j in pairs(require("luci.model.uci").cursor():changes()) do
- for k, l in pairs(j) do
- for m, n in pairs(l) do
- ucichanges = ucichanges + 1;
- end
- end
+ ucichanges = ucichanges + #j
end
if ucichanges > 0 then
@@ -203,7 +199,7 @@
<link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
<link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
- <link rel="stylesheet" href="<%=media%>/css/style.css">
+ <link rel="stylesheet" href="<%=media%>/cascade.css">
<link rel="shortcut icon" href="<%=media%>/favicon.ico">
<% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@@ -216,15 +212,17 @@
</head>
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
<header>
- <div class="container">
- <span class="showSide"></span>
- <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
- <div class="pull-right">
- <% render_changes() %>
- <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
- <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
- <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
- </span>
+ <div class="fill">
+ <div class="container">
+ <span class="showSide"></span>
+ <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
+ <div class="pull-right">
+ <% render_changes() %>
+ <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
+ <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
+ <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
+ </span>
+ </div>
</div>
</div>
</header>
diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index 197166b73a..5becfc5ba5 100644
--- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -379,6 +379,11 @@ textarea#syslog {
border-color: #444444;
}
+#applyreboot-section {
+ margin: 2rem;
+ line-height: 300%;
+}
+
.lang_he #maincontent {
direction: rtl;
}
@@ -1392,44 +1397,49 @@ select + .cbi-button {
.uci-change-list {
font-family: monospace;
+ white-space: pre;
}
+.uci-change-list del,
.uci-change-list ins,
-.uci-change-legend-label ins {
+.uci-change-list var,
+.uci-change-legend-label del,
+.uci-change-legend-label ins,
+.uci-change-legend-label var {
text-decoration: none;
- border: 1px solid #00FF00;
- background-color: #CCFFCC;
- display: block;
+ font-style: normal;
+ border: 1px solid #ccc;
+ background: #eee;
padding: 2px;
+ display: block;
+ line-height: 15px;
+ margin-bottom: 1px;
+}
+
+.uci-change-list ins,
+.uci-change-legend-label ins {
+ border-color: #0f0;
+ background: #cfc;
}
.uci-change-list del,
.uci-change-legend-label del {
- text-decoration: none;
- border: 1px solid #FF0000;
- background-color: #FFCCCC;
- display: block;
- font-style: normal;
- padding: 2px;
+ border-color: #f00;
+ background: #fcc;
}
.uci-change-list var,
.uci-change-legend-label var {
- text-decoration: none;
- border: 1px solid #CCCCCC;
- background-color: #EEEEEE;
- display: block;
- font-style: normal;
- padding: 2px;
+ border-color: #ccc;
+ background: #eee;
}
.uci-change-list var ins,
.uci-change-list var del {
- /*display: inline;*/
+ display: inline-block;
border: none;
- white-space: pre;
- font-style: normal;
- padding: 0px;
+ width: 100%;
+ padding: 0;
}
.uci-change-legend {
@@ -1447,15 +1457,20 @@ select + .cbi-button {
.uci-change-legend-label>var {
float: left;
margin-right: 4px;
- width: 10px;
- height: 10px;
+ width: 12px;
+ height: 12px;
display: block;
+ position: relative;
}
.uci-change-legend-label var ins,
.uci-change-legend-label var del {
- line-height: 6px;
border: none;
+ position: absolute;
+ top: 1px;
+ left: 1px;
+ right: 1px;
+ bottom: 1px;
}
diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index e77f9a4bfe..6fc657ddce 100644
--- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -129,12 +129,9 @@
local function render_changes()
if tree.nodes[category] and tree.nodes[category].ucidata then
local ucic = 0
+ local i, j
for i, j in pairs(require("luci.model.uci").cursor():changes()) do
- for k, l in pairs(j) do
- for m, n in pairs(l) do
- ucic = ucic + 1;
- end
- end
+ ucic = ucic + #j
end
if ucic > 0 then