Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

1 files changed, 47 insertions, 48 deletions

diff --git a/applications/luci-app-adblock/po/zh-tw/adblock.po b/applications/luci-app-adblock/po/zh-tw/adblock.po
index c39e909def..15d49df901 100644
--- a/applications/luci-app-adblock/po/zh-tw/adblock.po
+++ b/applications/luci-app-adblock/po/zh-tw/adblock.po
@@ -5,15 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-01-03 20:37+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2019-12-19 19:40+0000\n"
+"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationsadblock/zh_Hant/>\n"
+"Language: zh-tw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:78
 msgid ""
@@ -26,37 +27,37 @@ msgstr ""
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:86
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Action"
-msgstr "動作"
+msgstr "行動"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:17
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:10
 msgid "Adblock"
-msgstr "Adblock"
+msgstr "廣告塊"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:151
 msgid "Adblock Status"
-msgstr "Adblock 狀態"
+msgstr "廣告塊狀態"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:157
 msgid "Adblock Version"
-msgstr "Adblock 版本"
+msgstr "廣告塊版本"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:182
 msgid "Additional trigger delay in seconds before adblock processing begins."
-msgstr "觸發 Adblock 開始處理前的額外延遲（秒）。"
+msgstr "廣告塊處理開始前數秒內的額外觸發延遲。"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:23
 msgid "Advanced"
-msgstr "高階"
+msgstr "進階"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:85
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Answer"
-msgstr "回答"
+msgstr "回覆"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:96
 msgid "Archive Categories"
-msgstr "存檔類別"
+msgstr "存檔分類"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:146
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:181
@@ -65,50 +66,48 @@ msgstr "備份目錄"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:106
 msgid "Blacklist"
-msgstr "黑名單"
+msgstr "拉黑"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:169
 msgid "Blacklist File"
-msgstr ""
+msgstr "拉黑檔案"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:274
 msgid "Blocked DNS Queries"
-msgstr "已攔截的 DNS 請求"
+msgstr "封锁的DNS査詢"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:30
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:73
 msgid "Blocked Domain"
-msgstr "已攔截的域名"
+msgstr "封锁网域"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:77
 msgid "Blocklist Sources"
-msgstr "攔截列表來源"
+msgstr "拉黑檔案清單"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:37
 msgid "Blocklist not found!"
-msgstr "攔截列表未找到！"
+msgstr "未揾到拉黑檔案清單!"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:56
 msgid ""
 "Choose 'none' to disable automatic startups, 'timed' to use a classic "
 "timeout (default 30 sec.) or select another trigger interface."
-msgstr ""
-"選擇“none”以禁用自動啟動，“timed”以使用預設的超時設定（預設 30 秒），或選擇另"
-"一個觸發介面。"
+msgstr "選擇\"無\"以禁用自動啟動，\"超時\"以使用經典超時（預設為 30 秒）或選擇其他觸發器介面。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:83
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Client"
-msgstr "客戶端"
+msgstr "顧客"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/query.htm:59
 msgid "Collecting data..."
-msgstr "正在收集資料..."
+msgstr "收集資料中..."
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:11
 msgid ""
 "Configuration of the adblock package to block ad/abuse domains by using DNS."
-msgstr "Adblock 配置工具，通過 DNS 來攔截廣告和阻止域名。"
+msgstr "配置廣告塊包，以便使用 DNS 阻止廣告/濫用域。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:25
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:27
@@ -117,7 +116,7 @@ msgstr "Adblock 配置工具，通過 DNS 來攔截廣告和阻止域名。"
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:70
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:72
 msgid "Count"
-msgstr "計數"
+msgstr "次數"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:24
 msgid "DNS Backend (DNS Directory)"
@@ -125,11 +124,11 @@ msgstr "DNS 後端（DNS 目錄）"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:169
 msgid "DNS Backend, DNS Directory"
-msgstr ""
+msgstr "DNS 後端，DNS 目錄"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:34
 msgid "DNS Blocking Variant"
-msgstr ""
+msgstr "DNS封锁變體"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:164
 msgid "DNS Directory"
@@ -137,11 +136,11 @@ msgstr "DNS 目錄"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:127
 msgid "DNS File Reset"
-msgstr ""
+msgstr "DNS檔案重置"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:197
 msgid "DNS Inotify"
-msgstr ""
+msgstr "DNS 校証"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:20
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:134
@@ -150,7 +149,7 @@ msgstr "DNS 查詢報告"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:175
 msgid "DNS Variant, DNS File Reset"
-msgstr ""
+msgstr "DNS 變體，DNS 檔重置"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:81
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
@@ -159,40 +158,40 @@ msgstr "日期"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:94
 msgid "Description"
-msgstr "描述"
+msgstr "說明"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:198
 msgid ""
 "Disable adblock triggered restarts and the 'DNS File Reset' for DNS backends "
 "with autoload features."
-msgstr ""
+msgstr "禁用廣告板觸發重新開機和\"DNS 檔重置\"的 DNS 後端與自動載入功能。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:187
 msgid ""
 "Disable the toplevel domain compression, if the number of blocked domains is "
 "greater than this threshold."
-msgstr ""
+msgstr "如果阻止的域數大於此閾值，請禁用頂層網域壓縮。"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:36
 msgid ""
 "Dnsmasq also supports 'null' block variants, which may provide better "
 "response times."
-msgstr ""
+msgstr "Dnsmasq 還支援\"空\"塊變體，這可能提供更好的回應時間。"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:28
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:71
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:84
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:89
 msgid "Domain"
-msgstr "域名"
+msgstr "網域"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/report.htm:294
 msgid "Domain/Client/Date/Time"
-msgstr ""
+msgstr "域/客户/日期/时间"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:43
 msgid "Download Utility"
-msgstr "下載工具"
+msgstr "下載實用程式"
 
 #: applications/luci-app-adblock/luasrc/view/adblock/runtime.htm:163
 msgid "Download Utility (SSL Library)"
@@ -200,31 +199,31 @@ msgstr "下載實用程式（SSL 庫）"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:152
 msgid "E-Mail Notification"
-msgstr ""
-
-#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
-msgid "E-Mail Receiver Address"
-msgstr ""
+msgstr "電子郵件通知"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:260
 msgid "E-mail Notification Count"
-msgstr ""
+msgstr "電子郵件通知計數"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:255
 msgid "E-mail Profile"
-msgstr ""
+msgstr "電子郵件設定檔"
+
+#: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:157
+msgid "E-mail Receiver Address"
+msgstr "電子郵件接收方位址"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:245
 msgid "E-mail Sender Address"
-msgstr ""
+msgstr "電子郵件寄件者位址"
 
 #: applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua:250
 msgid "E-mail Topic"
-msgstr ""
+msgstr "電子郵件主題"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:24
 msgid "Edit Blacklist"
-msgstr "編輯黑名單"
+msgstr "編輯拉黑檔案"
 
 #: applications/luci-app-adblock/luasrc/controller/adblock.lua:26
 msgid "Edit Configuration"