Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

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

3 files changed, 18 insertions, 14 deletions

diff --git a/applications/luci-app-upnp/po/fr/upnp.po b/applications/luci-app-upnp/po/fr/upnp.po
index c5e068ccf3..b312a2ee67 100644
--- a/applications/luci-app-upnp/po/fr/upnp.po
+++ b/applications/luci-app-upnp/po/fr/upnp.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2019-10-24 13:53+0000\n"
-"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
+"PO-Revision-Date: 2020-01-03 04:12+0000\n"
+"Last-Translator: Philippe Paté <asushen@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsupnp/fr/>\n"
 "Language: fr\n"
@@ -12,7 +12,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.9.1-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -78,7 +78,7 @@ msgstr "Commentaire"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:29
 msgid "Delete"
-msgstr ""
+msgstr "Effacer"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
 msgid "Description"
@@ -199,7 +199,7 @@ msgstr "Universal Plug & Play"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:26
 msgid "Unknown"
-msgstr ""
+msgstr "Inconnu"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:47
 msgid "Uplink"
diff --git a/applications/luci-app-upnp/po/ro/upnp.po b/applications/luci-app-upnp/po/ro/upnp.po
index a6c8e0816a..04b2393ccf 100644
--- a/applications/luci-app-upnp/po/ro/upnp.po
+++ b/applications/luci-app-upnp/po/ro/upnp.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2019-12-16 23:24+0000\n"
+"PO-Revision-Date: 2020-01-03 04:12+0000\n"
 "Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsupnp/ro/>\n"
@@ -11,7 +11,7 @@ msgstr ""
 "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-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -79,7 +79,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
 msgid "Description"
-msgstr ""
+msgstr "Descriere"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
 msgid "Device UUID"
diff --git a/applications/luci-app-upnp/po/sk/upnp.po b/applications/luci-app-upnp/po/sk/upnp.po
index 6f00b9b05a..368dd31bf3 100644
--- a/applications/luci-app-upnp/po/sk/upnp.po
+++ b/applications/luci-app-upnp/po/sk/upnp.po
@@ -1,12 +1,16 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"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/"
+"luciapplicationsupnp/sk/>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\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-upnp/luasrc/model/cbi/upnp/upnp.lua:81
 msgid ""
@@ -16,7 +20,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:102
 msgid "Action"
-msgstr ""
+msgstr "Akcia"
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:39
 msgid "Active UPnP Redirects"
@@ -60,7 +64,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:51
 msgid "Collecting data..."
-msgstr ""
+msgstr "Zbieram dáta..."
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:88
 msgid "Comment"
@@ -72,7 +76,7 @@ msgstr ""
 
 #: applications/luci-app-upnp/luasrc/view/upnp_status.htm:47
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #: applications/luci-app-upnp/luasrc/model/cbi/upnp/upnp.lua:57
 msgid "Device UUID"