summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
Diffstat (limited to 'applications')
-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
187 files changed, 6764 insertions, 2446 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 "限定將傳送網路喚醒資料包的介面"