Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

4 files changed, 34 insertions, 15 deletions

diff --git a/applications/luci-app-olsr-services/po/cs/olsr-services.po b/applications/luci-app-olsr-services/po/cs/olsr-services.po
index 2be4920fec..b9d13ab6a2 100644
--- a/applications/luci-app-olsr-services/po/cs/olsr-services.po
+++ b/applications/luci-app-olsr-services/po/cs/olsr-services.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-02 16:11+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/"
 "luciapplicationsolsr-services/cs/>\n"
@@ -12,13 +12,15 @@ msgstr ""
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:159
 msgid "Internal services"
-msgstr ""
+msgstr "Interní služby"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:56
 msgid ""
 "No services can be shown, because olsrd is not running or the olsrd-"
 "nameservice Plugin is not loaded."
 msgstr ""
+"Nelze zobrazit žádné služby, protože olsrd není spuštěn nebo není načten "
+"modul olsrd-nameservice."
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:131
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:163
@@ -38,4 +40,4 @@ msgstr "Zdroj"
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:130
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:162
 msgid "Url"
-msgstr ""
+msgstr "URL"
diff --git a/applications/luci-app-olsr-services/po/hu/olsr-services.po b/applications/luci-app-olsr-services/po/hu/olsr-services.po
index 846c0d6cef..887aa120df 100644
--- a/applications/luci-app-olsr-services/po/hu/olsr-services.po
+++ b/applications/luci-app-olsr-services/po/hu/olsr-services.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-10 23:15+0000\n"
+"PO-Revision-Date: 2019-12-20 21:22+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsolsr-services/hu/>\n"
@@ -8,17 +8,19 @@ 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-olsr-services/luasrc/view/freifunk-services/services.htm:159
 msgid "Internal services"
-msgstr ""
+msgstr "Belső szolgáltatások"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:56
 msgid ""
 "No services can be shown, because olsrd is not running or the olsrd-"
 "nameservice Plugin is not loaded."
 msgstr ""
+"Nem lehet szolgáltatásokat megjeleníteni, mert az olsrd nem fut vagy az "
+"olsrd-nameservice bővítmény nincs betöltve."
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:131
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:163
@@ -38,4 +40,4 @@ msgstr "Forrás"
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:130
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:162
 msgid "Url"
-msgstr ""
+msgstr "URL"
diff --git a/applications/luci-app-olsr-services/po/mr/olsr-services.po b/applications/luci-app-olsr-services/po/mr/olsr-services.po
index 4c546c1b84..3b66fb70af 100644
--- a/applications/luci-app-olsr-services/po/mr/olsr-services.po
+++ b/applications/luci-app-olsr-services/po/mr/olsr-services.po
@@ -1,35 +1,43 @@
 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/"
+"luciapplicationsolsr-services/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-olsr-services/luasrc/view/freifunk-services/services.htm:159
 msgid "Internal services"
-msgstr ""
+msgstr "अंतर्गत सेवा"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:56
 msgid ""
 "No services can be shown, because olsrd is not running or the olsrd-"
 "nameservice Plugin is not loaded."
 msgstr ""
+"कोणत्याही सेवा दर्शविल्या जाऊ शकत नाहीत, कारण olsrd चालू नाही किंवा olsrd-"
+"nameservice प्लगइन लोड झाले नाही."
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:131
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:163
 msgid "Protocol"
-msgstr ""
+msgstr "प्रोटोकॉल"
 
 #: applications/luci-app-olsr-services/luasrc/controller/services.lua:13
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:156
 msgid "Services"
-msgstr ""
+msgstr "सेवा"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:132
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:164
 msgid "Source"
-msgstr ""
+msgstr "स्रोत"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:130
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:162
 msgid "Url"
-msgstr ""
+msgstr "युआरएल"
diff --git a/applications/luci-app-olsr-services/po/ru/olsr-services.po b/applications/luci-app-olsr-services/po/ru/olsr-services.po
index 5dbb454cac..333c33aba4 100644
--- a/applications/luci-app-olsr-services/po/ru/olsr-services.po
+++ b/applications/luci-app-olsr-services/po/ru/olsr-services.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/"
+"luciapplicationsolsr-services/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-olsr-services/luasrc/view/freifunk-services/services.htm:159
 msgid "Internal services"
@@ -17,17 +24,17 @@ msgstr ""
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:131
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:163
 msgid "Protocol"
-msgstr ""
+msgstr "Протокол"
 
 #: applications/luci-app-olsr-services/luasrc/controller/services.lua:13
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:156
 msgid "Services"
-msgstr ""
+msgstr "Службы"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:132
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:164
 msgid "Source"
-msgstr ""
+msgstr "Источник"
 
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:130
 #: applications/luci-app-olsr-services/luasrc/view/freifunk-services/services.htm:162