Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

6 files changed, 49 insertions, 41 deletions

diff --git a/applications/luci-app-upnp/po/hu/upnp.po b/applications/luci-app-upnp/po/hu/upnp.po
index 435ade3e23..29fd39cc88 100644
--- a/applications/luci-app-upnp/po/hu/upnp.po
+++ b/applications/luci-app-upnp/po/hu/upnp.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-10 23:14+0000\n"
+"PO-Revision-Date: 2019-12-30 18:21+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsupnp/hu/>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -44,11 +44,11 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:59
 msgid "Announced model number"
-msgstr "Közzétett modelszám"
+msgstr "Bejelentett modellszám"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:58
 msgid "Announced serial number"
-msgstr "Közzétett sorozatszám"
+msgstr "Bejelentett sorozatszám"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:69
 msgid "Clean rules interval"
@@ -88,11 +88,11 @@ msgstr "Eszköz UUID"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:44
 msgid "Downlink"
-msgstr "Letöltés"
+msgstr "Befelé jövő kapcsolat"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:38
 msgid "Enable IGDv1 mode"
-msgstr ""
+msgstr "IGDv1 mód engedélyezése"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:33
 msgid "Enable NAT-PMP functionality"
@@ -152,7 +152,7 @@ msgstr "Port"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:73
 msgid "Presentation URL"
-msgstr "Bemutatkozó URL"
+msgstr "Bemutató URL"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
 msgid "Protocol"
@@ -200,7 +200,7 @@ msgstr "Ismeretlen"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
 msgid "Uplink"
-msgstr "Feltöltés"
+msgstr "Kifelé menő kapcsolat"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:45
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:48
diff --git a/applications/luci-app-upnp/po/mr/upnp.po b/applications/luci-app-upnp/po/mr/upnp.po
index 2c853bc4cd..aff1a53fcd 100644
--- a/applications/luci-app-upnp/po/mr/upnp.po
+++ b/applications/luci-app-upnp/po/mr/upnp.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2019-12-15 21:22+0000\n"
+"PO-Revision-Date: 2019-12-28 03:17+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsupnp/mr/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -118,7 +118,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:12
 msgid "General Settings"
-msgstr ""
+msgstr "सामान्य सेटिंग्ज"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:45
 msgid "Host"
@@ -154,7 +154,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:42
 msgid "Protocol"
-msgstr ""
+msgstr "प्रोटोकॉल"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:42
 msgid "Puts extra debugging information into the system log"
diff --git a/applications/luci-app-upnp/po/ms/upnp.po b/applications/luci-app-upnp/po/ms/upnp.po
index 0f23371ea7..f0b317fb47 100644
--- a/applications/luci-app-upnp/po/ms/upnp.po
+++ b/applications/luci-app-upnp/po/ms/upnp.po
@@ -1,11 +1,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2019-12-18 04:21+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsupnp/ms/>\n"
+"Language: ms\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: Weblate 3.10-dev\n"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -15,7 +20,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
 msgid "Action"
-msgstr ""
+msgstr "Tindakan"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
 msgid "Active UPnP Redirects"
@@ -59,7 +64,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
 msgid "Collecting data..."
-msgstr ""
+msgstr "Mengumpul data..."
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
 msgid "Comment"
@@ -71,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
 msgid "Device UUID"
diff --git a/applications/luci-app-upnp/po/ro/upnp.po b/applications/luci-app-upnp/po/ro/upnp.po
index 75f1e8fe36..a6c8e0816a 100644
--- a/applications/luci-app-upnp/po/ro/upnp.po
+++ b/applications/luci-app-upnp/po/ro/upnp.po
@@ -1,16 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2013-09-25 19:15+0200\n"
-"Last-Translator: Mihai <WyRwSyK@gmail.com>\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2019-12-16 23:24+0000\n"
+"Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsupnp/ro/>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\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: Pootle 2.0.6\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-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -66,7 +67,7 @@ msgstr "Port client"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
 msgid "Collecting data..."
-msgstr "Colecteaza date.."
+msgstr "Colectare date..."
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
 msgid "Comment"
diff --git a/applications/luci-app-upnp/po/ru/upnp.po b/applications/luci-app-upnp/po/ru/upnp.po
index 9f2d9aa71d..a99441343c 100644
--- a/applications/luci-app-upnp/po/ru/upnp.po
+++ b/applications/luci-app-upnp/po/ru/upnp.po
@@ -1,17 +1,18 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: LuCI: upnp\n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2018-01-18 23:42+0300\n"
-"Language-Team: http://cyber-place.ru\n"
+"PO-Revision-Date: 2019-12-26 18:22+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsupnp/ru/>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7.1\n"
-"Last-Translator: Olimjon aka Kobin23 <olimko98@gmail.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"
+"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"
+"X-Generator: Weblate 3.10\n"
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
@@ -197,7 +198,7 @@ msgstr "Universal Plug & Play"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
 msgid "Unknown"
-msgstr ""
+msgstr "Неизвестно"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
 msgid "Uplink"
diff --git a/applications/luci-app-upnp/po/zh-tw/upnp.po b/applications/luci-app-upnp/po/zh-tw/upnp.po
index 9b9e662ade..7090d70f57 100644
--- a/applications/luci-app-upnp/po/zh-tw/upnp.po
+++ b/applications/luci-app-upnp/po/zh-tw/upnp.po
@@ -4,15 +4,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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"
+"PO-Revision-Date: 2019-12-19 19:39+0000\n"
+"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationsupnp/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"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -22,7 +23,7 @@ msgstr "ACL存取控制清單, 就是指定某些外部埠可以從導到內部�
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
 msgid "Action"
-msgstr "啓用"
+msgstr "行動"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
 msgid "Active UPnP Redirects"
@@ -66,7 +67,7 @@ msgstr "用戶端埠號"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
 msgid "Collecting data..."
-msgstr "收集數據中..."
+msgstr "收集資料中..."
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
 msgid "Comment"
@@ -78,7 +79,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
 msgid "Device UUID"