Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

4 files changed, 20 insertions, 13 deletions

diff --git a/applications/luci-app-udpxy/po/cs/udpxy.po b/applications/luci-app-udpxy/po/cs/udpxy.po
index 117ff3510c..c9b9f4084b 100644
--- a/applications/luci-app-udpxy/po/cs/udpxy.po
+++ b/applications/luci-app-udpxy/po/cs/udpxy.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-02 16:10+0000\n"
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
 "Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsudpxy/cs/>\n"
@@ -36,7 +36,7 @@ msgstr "Soubor protokolu"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:35
 msgid "Max clients"
-msgstr ""
+msgstr "Max klientů"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:59
 msgid "Multicast subscription renew"
diff --git a/applications/luci-app-udpxy/po/fr/udpxy.po b/applications/luci-app-udpxy/po/fr/udpxy.po
index c894ed29df..cb342452c7 100644
--- a/applications/luci-app-udpxy/po/fr/udpxy.po
+++ b/applications/luci-app-udpxy/po/fr/udpxy.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-10-24 13:55+0000\n"
-"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: reyur <remicaruyer@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsudpxy/fr/>\n"
 "Language: fr\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.9.1-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:23
 msgid "Bind IP/Interface"
@@ -48,7 +48,7 @@ msgstr ""
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:27
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:15
 msgid "Respawn"
diff --git a/applications/luci-app-udpxy/po/hu/udpxy.po b/applications/luci-app-udpxy/po/hu/udpxy.po
index 0573513ffc..1bf7c89fec 100644
--- a/applications/luci-app-udpxy/po/hu/udpxy.po
+++ b/applications/luci-app-udpxy/po/hu/udpxy.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-26 17:10+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/"
 "luciapplicationsudpxy/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-udpxy/luasrc/model/cbi/udpxy.lua:23
 msgid "Bind IP/Interface"
@@ -36,7 +36,7 @@ msgstr "Naplófájl"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:35
 msgid "Max clients"
-msgstr ""
+msgstr "Legtöbb ügyfél"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:59
 msgid "Multicast subscription renew"
@@ -52,7 +52,7 @@ msgstr "Port"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:15
 msgid "Respawn"
-msgstr ""
+msgstr "Újraszármaztatás"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:31
 msgid "Source IP/Interface"
diff --git a/applications/luci-app-udpxy/po/ru/udpxy.po b/applications/luci-app-udpxy/po/ru/udpxy.po
index 4342f5fac3..ae660af15b 100644
--- a/applications/luci-app-udpxy/po/ru/udpxy.po
+++ b/applications/luci-app-udpxy/po/ru/udpxy.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/"
+"luciapplicationsudpxy/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-udpxy/luasrc/model/cbi/udpxy.lua:23
 msgid "Bind IP/Interface"
@@ -22,7 +29,7 @@ msgstr ""
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:10
 msgid "Enabled"
-msgstr ""
+msgstr "Включено"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:39
 msgid "Log file"
@@ -42,7 +49,7 @@ msgstr ""
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:27
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:15
 msgid "Respawn"
@@ -54,7 +61,7 @@ msgstr ""
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:21
 msgid "Status"
-msgstr ""
+msgstr "Состояние"
 
 #: applications/luci-app-udpxy/luasrc/model/cbi/udpxy.lua:18
 msgid "Verbose"