Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

1 files changed, 17 insertions, 7 deletions

diff --git a/applications/luci-app-pagekitec/po/mr/pagekitec.po b/applications/luci-app-pagekitec/po/mr/pagekitec.po
index f8304f3fd..49fd47d10 100644
--- a/applications/luci-app-pagekitec/po/mr/pagekitec.po
+++ b/applications/luci-app-pagekitec/po/mr/pagekitec.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/"
+"luciapplicationspagekitec/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-pagekitec/luasrc/model/cbi/pagekitec.lua:2
 msgid ""
@@ -15,41 +21,45 @@ msgstr ""
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:20
 msgid "Basic HTTP"
-msgstr ""
+msgstr "मूलभूत HTTP"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:23
 msgid "Basic SSH"
-msgstr ""
+msgstr "मूलभूत SSH"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:21
+#, fuzzy
 msgid ""
 "Enable a tunnel to the local HTTP server (in most cases, this admin site)"
 msgstr ""
+"सक्षम एक बोगदा स्थानिक HTTP सर्व्हर (बहुतांश घटनांमध्ये, हे प्रशासन साइट)"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:24
 msgid "Enable a tunnel to the local SSH server"
-msgstr ""
+msgstr "स्थानिक SSH सर्व्हरसाठी बोगदा सक्षम करा"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:13
 msgid "Kite Name"
-msgstr ""
+msgstr "पतंग नाव"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:14
 msgid "Kite Secret"
-msgstr ""
+msgstr "पतंग रहस्य"
 
 #: applications/luci-app-pagekitec/luasrc/controller/pagekitec.lua:7
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:1
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:10
 msgid "PageKite"
-msgstr ""
+msgstr "पेजकाइट"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:16
 msgid "Static Setup"
-msgstr ""
+msgstr "स्टॅटिक सेटअप"
 
 #: applications/luci-app-pagekitec/luasrc/model/cbi/pagekitec.lua:17
 msgid ""
 "Static setup, disable FE failover and DDNS updates, set this if you are "
 "running your own frontend without a pagekite.me account"
 msgstr ""
+"स्टॅटिक सेटअप, एफई फेलओव्हर आणि डीडीएनएस अद्यतने अक्षम करा, जर आपण "
+"pagekite.me खात्याशिवाय स्वतःचा फ्रंटएंड चालवत असाल तर हे सेट करा"