Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

5 files changed, 34 insertions, 20 deletions

diff --git a/applications/luci-app-wireguard/po/hu/wireguard.po b/applications/luci-app-wireguard/po/hu/wireguard.po
index 144c4f5a42..f7654268a7 100644
--- a/applications/luci-app-wireguard/po/hu/wireguard.po
+++ b/applications/luci-app-wireguard/po/hu/wireguard.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-13 23:07+0000\n"
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationswireguard/hu/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
 msgid "Allowed IPs"
-msgstr ""
+msgstr "Engedélyezett IP-k"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
@@ -37,7 +37,7 @@ msgstr ""
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:131
 msgid "Firewall Mark"
-msgstr ""
+msgstr "Tűzfal jelölés"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:189
 msgid "Interface"
@@ -57,7 +57,7 @@ msgstr "Port figyelése"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:81
 msgid "Never"
-msgstr ""
+msgstr "Soha"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:251
 msgid "Peer"
diff --git a/applications/luci-app-wireguard/po/ms/wireguard.po b/applications/luci-app-wireguard/po/ms/wireguard.po
index 135bbf8705..845d30c421 100644
--- a/applications/luci-app-wireguard/po/ms/wireguard.po
+++ b/applications/luci-app-wireguard/po/ms/wireguard.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationswireguard/ms/>\n"
 "Language: ms\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.10-dev\n"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
 msgid "Allowed IPs"
@@ -11,7 +17,7 @@ msgstr ""
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
 msgid "Collecting data..."
-msgstr ""
+msgstr "Mengumpul data..."
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
 msgid "Configuration"
diff --git a/applications/luci-app-wireguard/po/ro/wireguard.po b/applications/luci-app-wireguard/po/ro/wireguard.po
index 803ca7f580..8d775df8a8 100644
--- a/applications/luci-app-wireguard/po/ro/wireguard.po
+++ b/applications/luci-app-wireguard/po/ro/wireguard.po
@@ -1,8 +1,15 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
+"Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationswireguard/ro/>\n"
 "Language: ro\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
 msgid "Allowed IPs"
@@ -11,7 +18,7 @@ msgstr ""
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
 msgid "Collecting data..."
-msgstr ""
+msgstr "Colectare date..."
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
 msgid "Configuration"
diff --git a/applications/luci-app-wireguard/po/zh-cn/wireguard.po b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
index b959d1a518..ca4f9b6bf4 100644
--- a/applications/luci-app-wireguard/po/zh-cn/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-cn/wireguard.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-12-04 12:08+0000\n"
-"Last-Translator: lissom <kkjoy2617@gmail.com>\n"
+"PO-Revision-Date: 2020-01-01 02:22+0000\n"
+"Last-Translator: Zheng Qian <sotux82@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationswireguard/zh_Hans/>\n"
 "Language: zh-cn\n"
@@ -14,7 +14,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.10\n"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
 msgid "Allowed IPs"
@@ -86,7 +86,7 @@ msgstr "显示/隐藏 QR 码"
 msgid ""
 "The QR-Code works per wg interface, it will be refreshed with every manual "
 "page reload and transfers the following information:"
-msgstr "QR码可用于每个wg界面，每次手动重新加载页面时都会刷新QR码，并传输以下信息："
+msgstr "QR 码可用于每个 wg 界面，每次手动重新加载页面时都会刷新 QR 码，并传输以下信息："
 
 #: applications/luci-app-wireguard/luasrc/controller/wireguard.lua:7
 msgid "WireGuard Status"
@@ -96,7 +96,7 @@ msgstr "WireGuard 状态"
 msgid ""
 "[Interface] A random, on the fly generated 'PrivateKey', the key will not be "
 "saved on the router"
-msgstr "[接口] 随机，动态生成的“ 私钥（PrivateKey）”，密钥将不会保存在路由器上"
+msgstr "[Interface] 一个随机、动态生成的“ PrivateKey”，密钥将不会保存在路由器上"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:213
 msgid ""
@@ -104,8 +104,8 @@ msgid ""
 "default of '0.0.0.0/0, ::/0' to allow sending traffic to any IPv4 and IPv6 "
 "address"
 msgstr ""
-"[Peer]该wg接口的'PublicKey'和默认值为'0.0.0.0/0，:: / "
-"0'的'AllowedIPs'，以允许将流量发送到任何IPv4和IPv6地址"
+"[Peer] 该 wg 接口的“PublicKey”和默认值为“0.0.0.0/0,::/0”的“AllowedIPs”，以允许将流量发送到任何 "
+"IPv4 和 IPv6 地址"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:91
 msgid "h ago"
diff --git a/applications/luci-app-wireguard/po/zh-tw/wireguard.po b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
index e1ab11209e..decc2274ba 100644
--- a/applications/luci-app-wireguard/po/zh-tw/wireguard.po
+++ b/applications/luci-app-wireguard/po/zh-tw/wireguard.po
@@ -3,17 +3,18 @@
 #
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-01-03 20:51+0800\n"
-"Language-Team:  <debian-l10n-chinese@lists.debian.org>\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/luciapplicationswireguard/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"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"Language: zh_CN\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:149
 msgid "Allowed IPs"
@@ -22,7 +23,7 @@ msgstr "允許的 IP"
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:225
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:259
 msgid "Collecting data..."
-msgstr "正在收集資料…"
+msgstr "收集資料中..."
 
 #: applications/luci-app-wireguard/luasrc/view/wireguard.htm:220
 msgid "Configuration"