Merge pull request #1264 from kuoruan/zh-cn-tr

Update some Simplified Chinese translation

diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua
index 03b9fc2..efa99b5 100644 (file)
--- a/applications/luci-app-adblock/luasrc/controller/adblock.lua
+++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua
@@ -5,7 +5,7 @@ module("luci.controller.adblock", package.seeall)
 
 local fs = require("nixio.fs")
 local util = require("luci.util")
-local template = require("luci.template")
+local templ = require("luci.template")
 local i18n = require("luci.i18n")
 
 function index()
@@ -19,17 +19,13 @@ function index()
        entry({"admin", "services", "adblock", "advanced", "blacklist"}, cbi("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true
        entry({"admin", "services", "adblock", "advanced", "whitelist"}, cbi("adblock/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true
        entry({"admin", "services", "adblock", "advanced", "configuration"}, cbi("adblock/configuration_tab"), _("Edit Configuration"), 130).leaf = true
-       entry({"admin", "services", "adblock", "advanced", "query"}, call("query"), _("Query domains"), 140).leaf = true
+       entry({"admin", "services", "adblock", "advanced", "query"}, template("adblock/query"), _("Query domains"), 140).leaf = true
        entry({"admin", "services", "adblock", "advanced", "result"}, call("queryData"), nil, 150).leaf = true
 end
 
 function logread()
        local logfile = util.trim(util.exec("logread -e 'adblock'"))
-       template.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile})
-end
-
-function query()
-       template.render("adblock/query", {title = i18n.translate("Adblock Domain Query")})
+       templ.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile})
 end
 
 function queryData(domain)

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
index 59cd1e8..ef70100 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
@@ -25,6 +25,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("adblock/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
index 1607f14..1d89485 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua
@@ -14,6 +14,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("adblock/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

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 68f9c88..aa57014 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -21,6 +21,8 @@ if parse ~= nil then
                        dnspath = "/var/lib/unbound"
                elseif backend == "named" then
                        dnspath = "/var/lib/bind"
+               elseif backend == "kresd" then
+                       dnspath = "/tmp/kresd"
                end
        end
 end
@@ -180,7 +182,7 @@ e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
 e2.default = e2.disabled
 e2.rmempty = false
 
-e3 = e:option(Flag, "adb_manmode", translate("Manual mode"),
+e3 = e:option(Flag, "adb_manmode", translate("Manual / Backup mode"),
        translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
 e3.default = e3.disabled
 e3.rmempty = false

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
index 10a5938..a3659eb 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
@@ -24,6 +24,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("adblock/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 07fd783..b3e139e 100644 (file)
--- 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.2\n"
+"X-Generator: Poedit 2.0.3\n"
 "Language: ja\n"
 
 msgid "Adblock"
 msgstr "Adblock"
 
-msgid "Adblock Domain Query"
-msgstr "Adblock ドメイン検索"
-
 msgid "Adblock Logfile"
 msgstr "Adblock ログファイル"
 
@@ -137,8 +134,8 @@ msgstr "最終実行日時"
 msgid "Loading"
 msgstr "読込中"
 
-msgid "Manual mode"
-msgstr "マニュアル モード"
+msgid "Manual / Backup mode"
+msgstr "手動 / バックアップ モード"
 
 msgid "No"
 msgstr "いいえ"
@@ -189,6 +186,9 @@ msgstr "実行情報"
 msgid "SSL req."
 msgstr "SSL 必須"
 
+msgid "Save"
+msgstr "保存"
+
 msgid ""
 "Space separated list of interfaces that trigger adblock processing. To "
 "disable event driven (re-)starts remove all entries."
@@ -201,15 +201,15 @@ msgid "Status"
 msgstr "ステータス"
 
 msgid "Suspend / Resume adblock"
-msgstr "Adblock の一時停止/再開"
+msgstr "Adblock の一時停止 / 再開"
 
 msgid "Suspend adblock"
 msgstr "Adblock の一時停止"
 
 msgid "The file size is too large for online editing in LuCI (> 512 KB)."
 msgstr ""
-"ファイル サイズが大きすぎるため、 LuCI 上でオンライン編集できません（> "
-"512 KB）。"
+"ファイル サイズが大きすぎる（512 KB超）ため、 LuCI 上でオンライン編集できませ"
+"ん。"
 
 msgid ""
 "This form allows you to modify the content of the adblock blacklist (%s)."
@@ -253,7 +253,7 @@ msgid "View Logfile"
 msgstr "ログファイルを見る"
 
 msgid "Waiting for command to complete..."
-msgstr "コマンドの完了をお待ちください..."
+msgstr "コマンド実行中です..."
 
 msgid "Yes"
 msgstr "はい"

diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 044352d..586c318 100644 (file)
--- 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 "Adblock"
 msgstr "Adblock"
 
-msgid "Adblock Domain Query"
-msgstr ""
-
 msgid "Adblock Logfile"
 msgstr ""
 
@@ -127,7 +124,7 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-msgid "Manual mode"
+msgid "Manual / Backup mode"
 msgstr ""
 
 msgid "No"
@@ -176,6 +173,9 @@ msgstr ""
 msgid "SSL req."
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
 msgid ""
 "Space separated list of interfaces that trigger adblock processing. To "
 "disable event driven (re-)starts remove all entries."

diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index cf92dbd..a70a1a1 100644 (file)
--- 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 "Adblock"
 msgstr "Adblock"
 
-msgid "Adblock Domain Query"
-msgstr ""
-
 msgid "Adblock Logfile"
 msgstr "Adblock's loggfil"
 
@@ -117,7 +114,7 @@ msgstr ""
 msgid "Loading"
 msgstr "Laddar"
 
-msgid "Manual mode"
+msgid "Manual / Backup mode"
 msgstr ""
 
 msgid "No"
@@ -164,6 +161,9 @@ msgstr "Information om kör-tid"
 msgid "SSL req."
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
 msgid ""
 "Space separated list of interfaces that trigger adblock processing. To "
 "disable event driven (re-)starts remove all entries."

diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 5b5a968..3b61036 100644 (file)
--- 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 "Adblock"
 msgstr ""
 
-msgid "Adblock Domain Query"
-msgstr ""
-
 msgid "Adblock Logfile"
 msgstr ""
 
@@ -114,7 +111,7 @@ msgstr ""
 msgid "Loading"
 msgstr ""
 
-msgid "Manual mode"
+msgid "Manual / Backup mode"
 msgstr ""
 
 msgid "No"
@@ -161,6 +158,9 @@ msgstr ""
 msgid "SSL req."
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
 msgid ""
 "Space separated list of interfaces that trigger adblock processing. To "
 "disable event driven (re-)starts remove all entries."

diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 46dc99e..534e8f5 100644 (file)
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -16,9 +16,6 @@ msgstr ""
 msgid "Adblock"
 msgstr "Adblock"
 
-msgid "Adblock Domain Query"
-msgstr ""
-
 msgid "Adblock Logfile"
 msgstr "Adblock 日志文件"
 
@@ -126,7 +123,7 @@ msgstr ""
 msgid "Loading"
 msgstr "加载中"
 
-msgid "Manual mode"
+msgid "Manual / Backup mode"
 msgstr ""
 
 msgid "No"
@@ -173,6 +170,9 @@ msgstr "运行信息"
 msgid "SSL req."
 msgstr ""
 
+msgid "Save"
+msgstr ""
+
 msgid ""
 "Space separated list of interfaces that trigger adblock processing. To "
 "disable event driven (re-)starts remove all entries."

diff --git a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
index 8bcec3b..4f8bf7c 100644 (file)
--- a/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
+++ b/applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm
@@ -178,7 +178,7 @@ function image_request() {
        request_dict = {}
        request_dict.version = latest_version;
        request_dict.board = data.board_name
-       server_request(request_dict, "/image-request", image_request_handler)
+       server_request(request_dict, "image-request", image_request_handler)
 }
 
 function image_request_handler(response) {

diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua
index d9a61d0..22f3106 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/cbi/shadowsocks-libev/instance-details.lua
@@ -24,6 +24,7 @@ s:tab("general", translate("General Settings"))
 s:tab("advanced", translate("Advanced Settings"))
 s:taboption("general", Flag, "disabled", translate("Disable"))
 ss.option_install_package(s, "general")
+ss.options_common(s, "advanced")
 
 if stype == "ss_server" then
        ss.options_server(s, "general")
@@ -42,8 +43,11 @@ else
                        translate("Tunnel address"),
                        translate("The address ss-tunnel will forward traffic to"))
                o.datatype = "hostport"
+       elseif stype == "ss_redir" then
+               o = s:taboption("advanced", Flag, "disable_sni",
+                       translate("Disable SNI"),
+                       translate("Disable parsing HTTP/HTTPS payload to find then resolve hostname at remote server"))
        end
 end
-ss.options_common(s, "advanced")
 
 return m

diff --git a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
index b11890f..63f7ba3 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
+++ b/applications/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua
@@ -132,6 +132,8 @@ function cfgvalue_overview(sdata)
                cfgvalue_overview_(sdata, lines, names_options_client)
                if stype == "ss_tunnel" then
                        cfgvalue_overview_(sdata, lines, {"tunnel_address"})
+               elseif stype == "ss_redir" then
+                       cfgvalue_overview_(sdata, lines, {"disable_sni"})
                end
                cfgvalue_overview_(sdata, lines, names_options_common)
        else

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua
index 009ed80..e5a048f 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_firewall_tab.lua
@@ -12,6 +12,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("travelmate/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua
index 4d43637..0096d6a 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_network_tab.lua
@@ -12,6 +12,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("travelmate/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua
index a025c13..7ef9920 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua
@@ -12,6 +12,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("travelmate/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua
index 4233da6..8a20ab9 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua
@@ -14,6 +14,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("travelmate/config_css"))
+m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,

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 12cb72c..b16fb41 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua
@@ -35,20 +35,17 @@ if uplink == "" then
        o.default = "trm_wwan"
        o.rmempty = false
 
-       function o.write(self, section, value)
-               iface = o:formvalue(section)
-               uci:set("travelmate", section, "trm_iface", iface)
-               uci:save("travelmate")
-               uci:commit("travelmate")
-       end
-
        btn = s:option(Button, "", translate("Create Uplink Interface"),
                translate("Create a new wireless wan uplink interface, configure it to use dhcp and ")
                .. translate("add it to the wan zone of the firewall. This step has only to be done once."))
        btn.inputtitle = translate("Add Interface")
        btn.inputstyle = "apply"
        btn.disabled = false
-       function btn.write()
+       function btn.write(self, section, value)
+               iface = o:formvalue(section)
+               uci:set("travelmate", section, "trm_iface", iface)
+               uci:save("travelmate")
+               uci:commit("travelmate")
                local net = nw:add_network(iface, { proto = "dhcp" })
                if net then
                        nw:save("network")

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index 3f3f234..dcfa17c 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -7,6 +7,7 @@ local http = require("luci.http")
 local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
 
 m = SimpleForm("add", translate("Add Wireless Uplink Configuration"))
+m.submit = translate("Save")
 m.cancel = translate("Back to overview")
 m.reset = false
 

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
index b0a77e4..6d6bdcf 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
@@ -6,6 +6,7 @@ local uci = require("luci.model.uci").cursor()
 local http = require("luci.http")
 
 m = SimpleForm("edit", translate("Edit Wireless Uplink Configuration"))
+m.submit = translate("Save")
 m.cancel = translate("Back to overview")
 m.reset = false
 

diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index dea107e..b3907e8 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -76,14 +76,14 @@ This is free software, licensed under the Apache License, Version 2.0
         </table>
     </fieldset>
 <div class="cbi-page-actions right">
-    <form class="inline" action="<%=url('admin/services/travelmate/stations')%>" method="post">
-        <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
-    </form>
     <form class="inline" action="<%=url('admin/services/travelmate/wifiscan')%>" method="post">
         <input type="hidden" name="token" value="<%=token%>"/>
         <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
         <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>"/>
     </form>
+    <form class="inline" action="<%=url('admin/services/travelmate/stations')%>" method="post">
+        <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
+    </form>
 </div>
 </div>