Merge remote-tracking branch 'weblate/master'

Fix conflict at applications/luci-app-ddns/po/zh-tw/ddns.po

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

7 files changed, 40 insertions, 31 deletions

diff --git a/applications/luci-app-attendedsysupgrade/po/zh-tw/attendedsysupgrade.po b/applications/luci-app-attendedsysupgrade/po/zh-tw/attendedsysupgrade.po
index 8890c9616..1fd796f49 100644
--- a/applications/luci-app-attendedsysupgrade/po/zh-tw/attendedsysupgrade.po
+++ b/applications/luci-app-attendedsysupgrade/po/zh-tw/attendedsysupgrade.po
@@ -1,10 +1,16 @@
 msgid ""
 msgstr ""
-"Language: zh_Hant\n"
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
+"Last-Translator: Andy Yang <a962702@yahoo.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationsattendedsysupgrade/zh_Hant/>\n"
+"Language: zh-tw\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.11-dev\n"
 
 #: applications/luci-app-attendedsysupgrade/luasrc/controller/attendedsysupgrade.lua:4
 #: applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm:76
 msgid "Attended Sysupgrade"
-msgstr ""
+msgstr "參與式系統升級"
diff --git a/applications/luci-app-ddns/po/zh-tw/ddns.po b/applications/luci-app-ddns/po/zh-tw/ddns.po
index fd747c6c4..27950f6b9 100644
--- a/applications/luci-app-ddns/po/zh-tw/ddns.po
+++ b/applications/luci-app-ddns/po/zh-tw/ddns.po
@@ -5,8 +5,8 @@ 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: 2019-12-19 19:39+0000\n"
-"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
+"Last-Translator: Andy Yang <a962702@yahoo.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsddns/zh_Hant/>\n"
 "Language: zh-tw\n"
@@ -14,16 +14,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.11-dev\n"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:964
 msgid "\"../\" not allowed in path for Security Reason."
-msgstr ""
+msgstr "基於安全原因，不允許在路徑中含有 \"../\"。"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:294
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:323
 msgid "Add new services..."
-msgstr ""
+msgstr "新增新服務…"
 
 #: applications/luci-app-ddns/htdocs/luci-static/resources/view/ddns/overview.js:443
 msgid "Advanced Settings"
diff --git a/applications/luci-app-firewall/po/es/firewall.po b/applications/luci-app-firewall/po/es/firewall.po
index b5a7fa2d0..7db8a3975 100644
--- a/applications/luci-app-firewall/po/es/firewall.po
+++ b/applications/luci-app-firewall/po/es/firewall.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2020-01-22 18:21+0000\n"
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
 "Last-Translator: Franco Castillo <castillofrancodamian@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsfirewall/es/>\n"
@@ -30,7 +30,7 @@ msgid ""
 "&quot;\">%{helper.val}</var>:<var data-tooltip=\"%{helper.name}\">%{helper."
 "val}</var>}}"
 msgstr ""
-"%{src?%{dest?Reenvío:Entrante}:Saliente} %{ipv6?%{ipv4?<var>IPv4</var> and "
+"%{src?%{dest?Reenvío:Entrante}:Saliente} %{ipv6?%{ipv4?<var>IPv4</var> y "
 "<var>IPv6</var>:<var>IPv6</var>}:<var>IPv4</var>}%{proto?, protocolo "
 "%{proto#%{next?, }%{item.types?<var class=\"cbi-tooltip-container\""
 ">%{item.name}<span class=\"cbi-tooltip\">ICMP con tipos %{item.types#%{"
@@ -1270,7 +1270,7 @@ msgstr "ilimitado"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:242
 msgid "unspecified"
-msgstr "sin especificar"
+msgstr "Sin especificar"
 
 #: applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js:336
 msgid "valid firewall mark"
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
index d8f7097a0..55ef9cb54 100644
--- a/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/zh-tw/mjpg-streamer.po
@@ -6,15 +6,16 @@ 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"
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
+"Last-Translator: Andy Yang <a962702@yahoo.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationsmjpg-streamer/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 2.91.7\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.11-dev\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:217
@@ -125,11 +126,11 @@ msgstr "LED 控制"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
 msgid "Link newest picture to fixed file name"
-msgstr ""
+msgstr "將最新的圖片連結到固定的檔案名稱"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:222
 msgid "Link the last picture in ringbuffer to fixed named file provided."
-msgstr ""
+msgstr "將環形緩衝區中的最後一張圖片連結到自訂的固定檔案名稱。"
 
 #: applications/luci-app-mjpg-streamer/luasrc/controller/mjpg-streamer.lua:12
 msgid "MJPG-streamer"
diff --git a/applications/luci-app-noddos/po/zh-tw/noddos.po b/applications/luci-app-noddos/po/zh-tw/noddos.po
index d731c534b..d4f5e46f7 100644
--- a/applications/luci-app-noddos/po/zh-tw/noddos.po
+++ b/applications/luci-app-noddos/po/zh-tw/noddos.po
@@ -3,13 +3,15 @@
 #
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
+"Last-Translator: Andy Yang <a962702@yahoo.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationsnoddos/zh_Hant/>\n"
+"Language: zh-tw\n"
 "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"
+"X-Generator: Weblate 3.11-dev\n"
 
 #: applications/luci-app-noddos/luasrc/view/noddos/clients.htm:48
 msgid "Class"
@@ -25,11 +27,11 @@ msgstr "客戶端"
 
 #: applications/luci-app-noddos/luasrc/view/noddos/clients.htm:83
 msgid "DHCP Hostname"
-msgstr ""
+msgstr "DHCP 主機名稱"
 
 #: applications/luci-app-noddos/luasrc/view/noddos/clients.htm:82
 msgid "DHCP Vendor"
-msgstr ""
+msgstr "DHCP 供應商"
 
 #: applications/luci-app-noddos/luasrc/model/cbi/noddos.lua:25
 msgid "Don't monitor these IPv4 addresses"
diff --git a/applications/luci-app-samba/po/zh-tw/samba.po b/applications/luci-app-samba/po/zh-tw/samba.po
index 9491b2d53..2324c97dd 100644
--- a/applications/luci-app-samba/po/zh-tw/samba.po
+++ b/applications/luci-app-samba/po/zh-tw/samba.po
@@ -6,8 +6,8 @@ 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: 2019-12-19 19:39+0000\n"
-"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
+"Last-Translator: Andy Yang <a962702@yahoo.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationssamba/zh_Hant/>\n"
 "Language: zh-tw\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.11-dev\n"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:64
 msgid "Allow guests"
@@ -51,7 +51,7 @@ msgstr "編輯模板"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:22
 msgid "Edit the template that is used for generating the samba configuration."
-msgstr "編輯用來生成 samba 設定的模板"
+msgstr "編輯用來產生 samba 設定的模板。"
 
 #: applications/luci-app-samba/luasrc/model/cbi/samba.lua:10
 msgid "General Settings"
diff --git a/applications/luci-app-samba4/po/zh-tw/samba4.po b/applications/luci-app-samba4/po/zh-tw/samba4.po
index 1680239fe..350740125 100644
--- a/applications/luci-app-samba4/po/zh-tw/samba4.po
+++ b/applications/luci-app-samba4/po/zh-tw/samba4.po
@@ -6,8 +6,8 @@ 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: 2019-12-19 19:39+0000\n"
-"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"PO-Revision-Date: 2020-01-23 19:18+0000\n"
+"Last-Translator: Andy Yang <a962702@yahoo.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationssamba4/zh_Hant/>\n"
 "Language: zh-tw\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.11-dev\n"
 
 #: applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js:97
 msgid "Allow guests"
@@ -63,7 +63,7 @@ msgstr "編輯模板"
 
 #: applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js:58
 msgid "Edit the template that is used for generating the samba configuration."
-msgstr "編輯用來生成 samba 設定的模板"
+msgstr "編輯用來產生 samba 設定的模板。"
 
 #: applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js:44
 msgid "Enable macOS compatible shares"