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, 4 deletions

diff --git a/applications/luci-app-olsr-viz/po/cs/olsr-viz.po b/applications/luci-app-olsr-viz/po/cs/olsr-viz.po
index 52c0c0a81d..6926b3af80 100644
--- a/applications/luci-app-olsr-viz/po/cs/olsr-viz.po
+++ b/applications/luci-app-olsr-viz/po/cs/olsr-viz.po
@@ -1,13 +1,20 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:25+0000\n"
+"Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsolsr-viz/cs/>\n"
 "Language: cs\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-olsr-viz/luasrc/controller/olsr-viz.lua:4
 msgid "OLSR-Viz"
-msgstr ""
+msgstr "OLSR-Viz"
 
 #: applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm:4
 msgid "You need to allow javascript in your browser to show this page."
 msgstr ""
+"Chcete-li zobrazit tuto stránku, musíte povolit JavaScript v prohlížeči."
diff --git a/applications/luci-app-olsr-viz/po/de/olsr-viz.po b/applications/luci-app-olsr-viz/po/de/olsr-viz.po
index 9d33f9aa05..8051052593 100644
--- a/applications/luci-app-olsr-viz/po/de/olsr-viz.po
+++ b/applications/luci-app-olsr-viz/po/de/olsr-viz.po
@@ -1,13 +1,21 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-24 18:12+0000\n"
+"Last-Translator: ssantos <ssantos@web.de>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsolsr-viz/de/>\n"
 "Language: de\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-olsr-viz/luasrc/controller/olsr-viz.lua:4
 msgid "OLSR-Viz"
-msgstr ""
+msgstr "OLSR-Viz"
 
 #: applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm:4
 msgid "You need to allow javascript in your browser to show this page."
 msgstr ""
+"Sie müssen Javascript in ihrem Webbrowser aktivieren, um diese Seite "
+"anzeigen zu lassen."
diff --git a/applications/luci-app-olsr-viz/po/hu/olsr-viz.po b/applications/luci-app-olsr-viz/po/hu/olsr-viz.po
index abaafc6b11..6a87af3249 100644
--- a/applications/luci-app-olsr-viz/po/hu/olsr-viz.po
+++ b/applications/luci-app-olsr-viz/po/hu/olsr-viz.po
@@ -1,13 +1,20 @@
 msgid ""
 msgstr ""
+"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-viz/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-olsr-viz/luasrc/controller/olsr-viz.lua:4
 msgid "OLSR-Viz"
-msgstr ""
+msgstr "OLSR-Viz"
 
 #: applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm:4
 msgid "You need to allow javascript in your browser to show this page."
 msgstr ""
+"Engedélyeznie kell a JavaScriptet a böngészőben az oldal megjelenítéséhez."
diff --git a/applications/luci-app-olsr-viz/po/mr/olsr-viz.po b/applications/luci-app-olsr-viz/po/mr/olsr-viz.po
index 49ffa4a009..f4ec9f2676 100644
--- a/applications/luci-app-olsr-viz/po/mr/olsr-viz.po
+++ b/applications/luci-app-olsr-viz/po/mr/olsr-viz.po
@@ -1,13 +1,21 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:25+0000\n"
+"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
+"Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsolsr-viz/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-viz/luasrc/controller/olsr-viz.lua:4
 msgid "OLSR-Viz"
-msgstr ""
+msgstr "OLSR-Viz"
 
 #: applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm:4
 msgid "You need to allow javascript in your browser to show this page."
 msgstr ""
+"आपल्याला हे पृष्ठ दर्शविण्यासाठी आपल्या ब्राउझरमध्ये जावास्क्रिप्टला अनुमती "
+"देणे आवश्यक आहे."