Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

1 files changed, 15 insertions, 11 deletions

diff --git a/modules/luci-base/po/mr/base.po b/modules/luci-base/po/mr/base.po
index ad2b4c9cc..1e645e55b 100644
--- a/modules/luci-base/po/mr/base.po
+++ b/modules/luci-base/po/mr/base.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-15 21:21+0000\n"
+"PO-Revision-Date: 2019-12-28 03:16+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/luci/mr/>"
 "\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"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:910
 msgid "%.1f dB"
@@ -386,7 +386,7 @@ msgstr ""
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:14
 msgid "Add instance"
-msgstr ""
+msgstr "उदाहरण जोडा"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:142
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/sshkeys.js:148
@@ -1638,7 +1638,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:749
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:789
 msgid "Enable"
-msgstr ""
+msgstr "सक्षम करा"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:457
 msgid ""
@@ -2095,7 +2095,7 @@ msgstr ""
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:238
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:104
 msgid "General Settings"
-msgstr ""
+msgstr "सामान्य सेटिंग्ज"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:547
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:948
@@ -2211,7 +2211,7 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js:28
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:117
 msgid "Hostname"
-msgstr ""
+msgstr "होस्टनाव"
 
 #: modules/luci-base/htdocs/luci-static/resources/protocol/dhcp.js:22
 msgid "Hostname to send when requesting DHCP"
@@ -2615,7 +2615,7 @@ msgstr ""
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:989
 msgid "Interface name"
-msgstr ""
+msgstr "इंटरफेस नाव"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:117
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:267
@@ -2908,6 +2908,10 @@ msgstr ""
 msgid "Load Average"
 msgstr ""
 
+#: modules/luci-mod-network/luasrc/view/admin_network/diagnostics.htm:33
+msgid "Loading"
+msgstr "लोड करीत आहे"
+
 #: modules/luci-base/htdocs/luci-static/resources/ui.js:1841
 msgid "Loading directory contents…"
 msgstr ""
@@ -3327,7 +3331,7 @@ msgstr ""
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:705
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:49
 msgid "Name"
-msgstr ""
+msgstr "नाव"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1858
 msgid "Name of the new network"
@@ -4067,7 +4071,7 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:379
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js:31
 msgid "Protocol"
-msgstr ""
+msgstr "प्रोटोकॉल"
 
 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:261
 msgid "Provide NTP server"
@@ -4608,7 +4612,7 @@ msgstr ""
 
 #: modules/luci-base/root/usr/share/luci/menu.d/luci-base.json:45
 msgid "Services"
-msgstr ""
+msgstr "सेवा"
 
 #: modules/luci-base/htdocs/luci-static/resources/luci.js:1602
 msgid "Session expired"
@@ -4746,7 +4750,7 @@ msgstr ""
 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:61
 #: modules/luci-mod-status/luasrc/view/admin_status/routes.htm:103
 msgid "Source"
-msgstr ""
+msgstr "स्रोत"
 
 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:83
 msgid "Source Address"