Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

6 files changed, 91 insertions, 48 deletions

diff --git a/applications/luci-app-omcproxy/po/fr/omcproxy.po b/applications/luci-app-omcproxy/po/fr/omcproxy.po
index 99523f90f..5ebd51d4e 100644
--- a/applications/luci-app-omcproxy/po/fr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/fr/omcproxy.po
@@ -1,70 +1,78 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-26 18:24+0000\n"
+"Last-Translator: reyur <remicaruyer@gmail.com>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/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.10\n"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
-msgstr ""
+msgstr "Ajouter une instance"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
-msgstr ""
+msgstr "Interface Downlink"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
-msgstr ""
+msgstr "Proxy IGMPv3 et MLDv2 intégré"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
+"Portée de multidiffusion minimale vers le proxy (affecte uniquement la "
+"multidiffusion IPv6)"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
-msgstr ""
+msgstr "Instance proxy"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
-msgstr ""
+msgstr "Portée"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
-msgstr ""
+msgstr "Interface Uplink"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
-msgstr ""
+msgstr "D'où vient le multicast ?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
-msgstr ""
+msgstr "Où va le multicast ?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
-msgstr ""
+msgstr "admin-local"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
-msgstr ""
+msgstr "Par défaut"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
-msgstr ""
+msgstr "Global"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 #: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
-msgstr ""
+msgstr "omcproxy"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
-msgstr ""
+msgstr "organization-local"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
-msgstr ""
+msgstr "Domaine"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
-msgstr ""
+msgstr "site-local"
diff --git a/applications/luci-app-omcproxy/po/hu/omcproxy.po b/applications/luci-app-omcproxy/po/hu/omcproxy.po
index 3333c6f83..329b5bb15 100644
--- a/applications/luci-app-omcproxy/po/hu/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/hu/omcproxy.po
@@ -1,70 +1,78 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2020-01-01 02:22+0000\n"
+"Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
+"Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/hu/>\n"
 "Language: hu\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\n"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
-msgstr ""
+msgstr "Példány hozzáadása"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
-msgstr ""
+msgstr "Befelé jövő kapcsolat csatolója"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
-msgstr ""
+msgstr "Beágyazott IGMPv3 és MLDv2 proxy"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
+"Legkisebb proxyzandó csoportcímzési hatókör (csak az IPv6 csoportcímzést "
+"érinti)"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
-msgstr ""
+msgstr "Proxypéldány"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
-msgstr ""
+msgstr "Hatókör"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
-msgstr ""
+msgstr "Kifelé menő kapcsolat csatolója"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
-msgstr ""
+msgstr "Honnan jön a csoportcímzés?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
-msgstr ""
+msgstr "Hová megy a csoportcímzés?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
-msgstr ""
+msgstr "adminisztrátorszintű"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
-msgstr ""
+msgstr "alapértelmezett"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
-msgstr ""
+msgstr "globális"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 #: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
-msgstr ""
+msgstr "omcproxy"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
-msgstr ""
+msgstr "szervezetszintű"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
-msgstr ""
+msgstr "tartomány"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
-msgstr ""
+msgstr "oldalszintű"
diff --git a/applications/luci-app-omcproxy/po/mr/omcproxy.po b/applications/luci-app-omcproxy/po/mr/omcproxy.po
index 2f1067a3b..6d7a12da9 100644
--- a/applications/luci-app-omcproxy/po/mr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/mr/omcproxy.po
@@ -1,70 +1,77 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:27+0000\n"
+"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
+"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/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-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
-msgstr ""
+msgstr "उदाहरण जोडा"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
-msgstr ""
+msgstr "डाउनलिंक इंटरफेस"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
-msgstr ""
+msgstr "एम्बेड केलेले IGMPv3 आणि MLDv2 प्रॉक्सी"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
+"प्रॉक्सीसाठी किमान मल्टीकास्ट स्कोप (केवळ IPv6 मल्टीकास्टला प्रभावित करते)"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
-msgstr ""
+msgstr "प्रॉक्सी उदाहरण"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
-msgstr ""
+msgstr "व्याप्ती"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
-msgstr ""
+msgstr "अपलिंक इंटरफेस"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
-msgstr ""
+msgstr "मल्टीकास्ट कोठून आले आहे?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
-msgstr ""
+msgstr "मल्टीकास्ट कुठे जाईल?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
-msgstr ""
+msgstr "प्रशासन-स्थानिक"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
-msgstr ""
+msgstr "डीफॉल्ट"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
-msgstr ""
+msgstr "जागतिक"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 #: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
-msgstr ""
+msgstr "ओमप्रॉक्सी"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
-msgstr ""
+msgstr "संस्था-स्थानिक"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
-msgstr ""
+msgstr "क्षेत्र"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
-msgstr ""
+msgstr "साइट-स्थानिक"
diff --git a/applications/luci-app-omcproxy/po/ro/omcproxy.po b/applications/luci-app-omcproxy/po/ro/omcproxy.po
index abbcf5ba1..dd6428a9f 100644
--- a/applications/luci-app-omcproxy/po/ro/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ro/omcproxy.po
@@ -1,12 +1,19 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:27+0000\n"
+"Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/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-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
-msgstr ""
+msgstr "Adaugă instanţă"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
diff --git a/applications/luci-app-omcproxy/po/ru/omcproxy.po b/applications/luci-app-omcproxy/po/ru/omcproxy.po
index 52718b419..9b02dbef9 100644
--- a/applications/luci-app-omcproxy/po/ru/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/ru/omcproxy.po
@@ -1,12 +1,19 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-26 18:24+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/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-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
-msgstr ""
+msgstr "Добавить экземпляр"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
diff --git a/applications/luci-app-omcproxy/po/sv/omcproxy.po b/applications/luci-app-omcproxy/po/sv/omcproxy.po
index 405d030b2..f0674ff53 100644
--- a/applications/luci-app-omcproxy/po/sv/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/sv/omcproxy.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-21 21:43+0000\n"
+"Last-Translator: Mattias Münster <mattiasmun@gmail.com>\n"
+"Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/sv/>\n"
 "Language: sv\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\n"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
@@ -46,7 +52,7 @@ msgstr ""
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
-msgstr ""
+msgstr "standard"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"