Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

5 files changed, 44 insertions, 16 deletions

diff --git a/applications/luci-app-unbound/po/hu/unbound.po b/applications/luci-app-unbound/po/hu/unbound.po
index 6e7df0ea6..29ea93bd5 100644
--- a/applications/luci-app-unbound/po/hu/unbound.po
+++ b/applications/luci-app-unbound/po/hu/unbound.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-10 23:15+0000\n"
+"PO-Revision-Date: 2019-12-28 22:27+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsunbound/hu/>\n"
@@ -8,7 +8,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-unbound/luasrc/model/cbi/unbound/zones.lua:96
 msgid "(root)"
@@ -106,7 +106,7 @@ msgstr ""
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:233
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:243
 msgid "Default"
-msgstr ""
+msgstr "Alapértelmezett"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:164
 msgid "Denied (nxdomain)"
@@ -324,7 +324,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:199
 msgid "Ignore"
-msgstr ""
+msgstr "Mellőzés"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:179
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:191
diff --git a/applications/luci-app-unbound/po/mr/unbound.po b/applications/luci-app-unbound/po/mr/unbound.po
index 99674ccab..7af0619ec 100644
--- a/applications/luci-app-unbound/po/mr/unbound.po
+++ b/applications/luci-app-unbound/po/mr/unbound.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
+"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
+"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsunbound/mr/>\n"
 "Language: mr\n"
 "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"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:96
 msgid "(root)"
@@ -167,7 +173,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:39
 msgid "Enable"
-msgstr ""
+msgstr "सक्षम करा"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:101
 msgid "Enable DNS64"
@@ -713,7 +719,7 @@ msgstr ""
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:123
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:284
 msgid "default"
-msgstr ""
+msgstr "डीफॉल्ट"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:175
 msgid "download from <var>%s</var>"
diff --git a/applications/luci-app-unbound/po/ms/unbound.po b/applications/luci-app-unbound/po/ms/unbound.po
index 137ecb444..14ded4830 100644
--- a/applications/luci-app-unbound/po/ms/unbound.po
+++ b/applications/luci-app-unbound/po/ms/unbound.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:25+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsunbound/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-unbound/luasrc/model/cbi/unbound/zones.lua:96
 msgid "(root)"
@@ -30,7 +36,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:46
 msgid "Advanced"
-msgstr ""
+msgstr "Lanjutan"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:245
 msgid "Aggressive"
diff --git a/applications/luci-app-unbound/po/ru/unbound.po b/applications/luci-app-unbound/po/ru/unbound.po
index cd8afa89d..9cd96ec3a 100644
--- a/applications/luci-app-unbound/po/ru/unbound.po
+++ b/applications/luci-app-unbound/po/ru/unbound.po
@@ -1,8 +1,15 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsunbound/ru/>\n"
 "Language: ru\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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\n"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:96
 msgid "(root)"
@@ -30,7 +37,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:46
 msgid "Advanced"
-msgstr ""
+msgstr "Дополнительно"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:245
 msgid "Aggressive"
@@ -167,7 +174,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:39
 msgid "Enable"
-msgstr ""
+msgstr "Включить"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:101
 msgid "Enable DNS64"
@@ -203,7 +210,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:29
 msgid "Enabled"
-msgstr ""
+msgstr "Включено"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:274
 msgid "Extended Statistics"
@@ -400,7 +407,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:236
 msgid "Medium"
-msgstr ""
+msgstr "Средняя"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:231
 msgid "Memory Resource"
@@ -516,7 +523,7 @@ msgstr ""
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/server.lua:11
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/uciedit.lua:11
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zone-details.lua:59
 msgid "Server Port"
@@ -566,7 +573,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/controller/unbound.lua:38
 msgid "Status"
-msgstr ""
+msgstr "Состояние"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:256
 msgid "Strict Minimize"
@@ -636,7 +643,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:27
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: applications/luci-app-unbound/luasrc/controller/unbound.lua:26
 msgid "Unbound"
diff --git a/applications/luci-app-unbound/po/zh-tw/unbound.po b/applications/luci-app-unbound/po/zh-tw/unbound.po
index df5a774e3..ef4cd0d51 100644
--- a/applications/luci-app-unbound/po/zh-tw/unbound.po
+++ b/applications/luci-app-unbound/po/zh-tw/unbound.po
@@ -1,5 +1,14 @@
 msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8\n"
+msgstr ""
+"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/luciapplicationsunbound/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.10-dev\n"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/zones.lua:96
 msgid "(root)"
@@ -27,7 +36,7 @@ msgstr ""
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:46
 msgid "Advanced"
-msgstr "高階"
+msgstr "進階"
 
 #: applications/luci-app-unbound/luasrc/model/cbi/unbound/configure.lua:245
 msgid "Aggressive"