Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

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

3 files changed, 15 insertions, 7 deletions

diff --git a/applications/luci-app-ocserv/po/fr/ocserv.po b/applications/luci-app-ocserv/po/fr/ocserv.po
index b08444768f..7ee94e1136 100644
--- a/applications/luci-app-ocserv/po/fr/ocserv.po
+++ b/applications/luci-app-ocserv/po/fr/ocserv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-26 18:22+0000\n"
-"Last-Translator: reyur <remicaruyer@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/"
 "luciapplicationsocserv/fr/>\n"
 "Language: fr\n"
@@ -191,7 +191,7 @@ msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/controller/ocserv.lua:19
 msgid "Server Settings"
-msgstr ""
+msgstr "Paramètres du serveur"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:20
 msgid "Server's Public Key ID"
@@ -289,7 +289,7 @@ msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/users.lua:66
 msgid "Username"
-msgstr ""
+msgstr "Nom d'utilisateur"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:115
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:72
diff --git a/applications/luci-app-ocserv/po/pt/ocserv.po b/applications/luci-app-ocserv/po/pt/ocserv.po
index 0721b3d4a1..343f2be3fd 100644
--- a/applications/luci-app-ocserv/po/pt/ocserv.po
+++ b/applications/luci-app-ocserv/po/pt/ocserv.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-13 13:07+0000\n"
+"PO-Revision-Date: 2020-01-02 16:07+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsocserv/pt/>\n"
@@ -8,7 +8,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.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
@@ -287,6 +287,8 @@ msgid ""
 "The value to be communicated to the client to verify the server's "
 "certificate; this value only depends on the public key"
 msgstr ""
+"O valor a ser comunicado ao cliente para verificar o certificado do servidor;"
+" este valor depende apenas da chave pública"
 
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:41
 msgid "There are no active users."
diff --git a/applications/luci-app-ocserv/po/sk/ocserv.po b/applications/luci-app-ocserv/po/sk/ocserv.po
index f939526490..4b080c5db6 100644
--- a/applications/luci-app-ocserv/po/sk/ocserv.po
+++ b/applications/luci-app-ocserv/po/sk/ocserv.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/"
+"luciapplicationsocserv/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-ocserv/luasrc/model/cbi/ocserv/main.lua:124
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:80
@@ -40,7 +46,7 @@ msgstr ""
 
 #: applications/luci-app-ocserv/luasrc/view/ocserv_status.htm:62
 msgid "Collecting data..."
-msgstr ""
+msgstr "Zbieram dáta..."
 
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/main.lua:132
 #: applications/luci-app-ocserv/luasrc/model/cbi/ocserv/user-config.lua:111