Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

5 files changed, 43 insertions, 24 deletions

diff --git a/applications/luci-app-splash/po/hu/splash.po b/applications/luci-app-splash/po/hu/splash.po
index 2b2825edb5..a6b9fdd012 100644
--- a/applications/luci-app-splash/po/hu/splash.po
+++ b/applications/luci-app-splash/po/hu/splash.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-13 23:06+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/"
 "luciapplicationssplash/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-splash/luasrc/view/splash/splash.htm:65
 #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:13
@@ -111,7 +111,7 @@ msgstr ""
 #: applications/luci-app-splash/luasrc/view/splash/blocked.htm:15
 #: applications/luci-app-splash/luasrc/view/splash/splash.htm:54
 msgid "Contact"
-msgstr ""
+msgstr "Partner"
 
 #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:12
 msgid "Decline"
@@ -158,7 +158,7 @@ msgstr "Gépnév"
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:76
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:206
 msgid "IP Address"
-msgstr ""
+msgstr "IP-cím"
 
 #: applications/luci-app-splash/luasrc/view/splash/splash.htm:98
 msgid ""
@@ -203,7 +203,7 @@ msgstr ""
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:68
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:207
 msgid "MAC Address"
-msgstr ""
+msgstr "MAC-cím"
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:63
 msgid "MAC addresses in this list are blocked."
@@ -217,7 +217,7 @@ msgstr ""
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:77
 msgid "Netmask"
-msgstr ""
+msgstr "Hálózati maszk"
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:37
 msgid "Network"
@@ -236,7 +236,7 @@ msgstr ""
 
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:210
 msgid "Policy"
-msgstr "Szabály"
+msgstr "Házirend"
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:11
 msgid "Redirect target"
diff --git a/applications/luci-app-splash/po/mr/splash.po b/applications/luci-app-splash/po/mr/splash.po
index 36f7e46c46..897e79e6e2 100644
--- a/applications/luci-app-splash/po/mr/splash.po
+++ b/applications/luci-app-splash/po/mr/splash.po
@@ -3,14 +3,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-12-07 12:02+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\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/"
+"luciapplicationssplash/mr/>\n"
 "Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.4.0\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-splash/luasrc/view/splash/splash.htm:65
 #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:13
@@ -153,7 +155,7 @@ msgstr ""
 
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:205
 msgid "Hostname"
-msgstr ""
+msgstr "होस्टनाव"
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:76
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:206
diff --git a/applications/luci-app-splash/po/ms/splash.po b/applications/luci-app-splash/po/ms/splash.po
index 02e426bc58..087add3982 100644
--- a/applications/luci-app-splash/po/ms/splash.po
+++ b/applications/luci-app-splash/po/ms/splash.po
@@ -1,3 +1,19 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-12-17 00:23+0200\n"
+"PO-Revision-Date: 2019-12-16 23:23+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationssplash/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-splash/luasrc/view/splash/splash.htm:65
 #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:13
 msgid "Accept"
@@ -46,7 +62,7 @@ msgstr ""
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:62
 msgid "Blacklist"
-msgstr ""
+msgstr "Senarai Hitam"
 
 #: applications/luci-app-splash/luasrc/view/splash/blocked.htm:12
 msgid "Blocked"
diff --git a/applications/luci-app-splash/po/ru/splash.po b/applications/luci-app-splash/po/ru/splash.po
index b25d04f370..a8ad5d2844 100644
--- a/applications/luci-app-splash/po/ru/splash.po
+++ b/applications/luci-app-splash/po/ru/splash.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: splash\n"
 "POT-Creation-Date: 2013-11-13 18:52+0200\n"
-"PO-Revision-Date: 2019-11-15 03:04+0000\n"
-"Last-Translator: Alex Vinnick <alexv10@gmail.com>\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/"
 "luciapplicationssplash/ru/>\n"
 "Language: ru\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\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-dev\n"
+"X-Generator: Weblate 3.10\n"
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
@@ -80,7 +80,7 @@ msgstr ""
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:62
 msgid "Blacklist"
-msgstr "Чёрный Список"
+msgstr "Чёрный список"
 
 #: applications/luci-app-splash/luasrc/view/splash/blocked.htm:12
 msgid "Blocked"
@@ -447,7 +447,7 @@ msgstr "временно заблокирован"
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:230
 #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:231
 msgid "unknown"
-msgstr "неизвестно"
+msgstr "неизвестный"
 
 #: applications/luci-app-splash/luasrc/view/splash/splash.htm:83
 msgid "use filesharing applications on this network"
diff --git a/applications/luci-app-splash/po/zh-tw/splash.po b/applications/luci-app-splash/po/zh-tw/splash.po
index d8833c39b7..bc4df7ae81 100644
--- a/applications/luci-app-splash/po/zh-tw/splash.po
+++ b/applications/luci-app-splash/po/zh-tw/splash.po
@@ -6,15 +6,16 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-06-28 08:58+0200\n"
-"PO-Revision-Date: 2018-10-01 11:38+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/luciapplicationssplash/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-splash/luasrc/view/splash/splash.htm:65
 #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:13
@@ -74,7 +75,7 @@ msgstr "成為此社群的活躍成員，並通過操作您自己的節點提供
 
 #: applications/luci-app-splash/luasrc/model/cbi/splash/splash.lua:62
 msgid "Blacklist"
-msgstr "黑名單"
+msgstr "拉黑"
 
 #: applications/luci-app-splash/luasrc/view/splash/blocked.htm:12
 msgid "Blocked"