Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

1 files changed, 22 insertions, 15 deletions

diff --git a/applications/luci-app-omcproxy/po/mr/omcproxy.po b/applications/luci-app-omcproxy/po/mr/omcproxy.po
index 2f1067a3b2..6d7a12da9a 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 "साइट-स्थानिक"