Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

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

4 files changed, 27 insertions, 12 deletions

diff --git a/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
index 7d6eb5b86..21a984b93 100644
--- a/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-26 18:23+0000\n"
-"Last-Translator: reyur <remicaruyer@gmail.com>\n"
+"PO-Revision-Date: 2020-01-03 04:36+0000\n"
+"Last-Translator: Philippe Paté <asushen@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsmjpg-streamer/fr/>\n"
 "Language: fr\n"
@@ -206,7 +206,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:98
 msgid "Username"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:108
 msgid "WWW folder"
diff --git a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po
index 2f144327b..9f40c85c1 100644
--- a/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ja/mjpg-streamer.po
@@ -1,15 +1,17 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: INAGAKI Hiroshi <musashino.open@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2020-01-03 04:36+0000\n"
+"Last-Translator: INAGAKI Hiroshi <musashino.tech@gmail.com>\n"
+"Language-Team: Japanese <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsmjpg-streamer/ja/>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"X-Generator: Poedit 1.8.11\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:217
 msgid "Allow ringbuffer to exceed limit by this amount"
@@ -149,7 +151,7 @@ msgstr "MJPEG 出力"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:81
 msgid "Off"
-msgstr "消灯"
+msgstr "オフ"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:80
 msgid "On"
diff --git a/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po
index 610272c76..c32d6079e 100644
--- a/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/ro/mjpg-streamer.po
@@ -1,8 +1,15 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2020-01-03 04:36+0000\n"
+"Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsmjpg-streamer/ro/>\n"
 "Language: ro\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:217
 msgid "Allow ringbuffer to exceed limit by this amount"
@@ -62,7 +69,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
 msgid "Enabled"
-msgstr ""
+msgstr "Activat"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:217
 msgid "Exceed"
diff --git a/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po b/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po
index 91e1c1717..391763922 100644
--- a/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po
+++ b/applications/luci-app-mjpg-streamer/po/sk/mjpg-streamer.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2020-01-04 12:27+0000\n"
+"Last-Translator: Miloš Leškanič <leskanic@gmail.com>\n"
+"Language-Team: Slovak <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsmjpg-streamer/sk/>\n"
 "Language: sk\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\n"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:217
 msgid "Allow ringbuffer to exceed limit by this amount"
@@ -62,7 +68,7 @@ msgstr ""
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:12
 msgid "Enabled"
-msgstr ""
+msgstr "Zapnuté"
 
 #: applications/luci-app-mjpg-streamer/luasrc/model/cbi/mjpg-streamer.lua:217
 msgid "Exceed"