Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

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

3 files changed, 37 insertions, 31 deletions

diff --git a/applications/luci-app-travelmate/po/fr/travelmate.po b/applications/luci-app-travelmate/po/fr/travelmate.po
index f4bd4d993c..8e20814918 100644
--- a/applications/luci-app-travelmate/po/fr/travelmate.po
+++ b/applications/luci-app-travelmate/po/fr/travelmate.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-07 10:45+0000\n"
-"Last-Translator: Guillaume D. <2a3b@protonmail.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/"
 "luciapplicationstravelmate/fr/>\n"
 "Language: fr\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"
+"X-Generator: Weblate 3.10\n"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:206
 msgid "AP on"
@@ -136,7 +136,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:133
 msgid "Edit"
-msgstr ""
+msgstr "Éditer"
 
 #: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:25
 msgid "Edit Firewall Configuration"
@@ -179,7 +179,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:112
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:36
 msgid "Encryption"
-msgstr ""
+msgstr "Chiffrement"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:163
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:155
@@ -215,21 +215,21 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:62
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:127
 msgid "Force CCMP (AES)"
-msgstr ""
+msgstr "Forcer CCMP (AES)"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:81
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:140
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:63
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:128
 msgid "Force TKIP"
-msgstr ""
+msgstr "Forcer TKIP"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:82
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:141
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:64
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:129
 msgid "Force TKIP and CCMP (AES)"
-msgstr ""
+msgstr "Forcer TKIP et CCMP (AES)"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
@@ -239,7 +239,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:105
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:87
 msgid "Identity"
-msgstr ""
+msgstr "Identité"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
 msgid "Ignore BSSID"
@@ -280,11 +280,11 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:132
 msgid "Move down"
-msgstr ""
+msgstr "Descendre"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:131
 msgid "Move up"
-msgstr ""
+msgstr "Monter"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:80
 msgid "Name of the used uplink interface."
@@ -314,7 +314,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:18
 msgid "Overview"
-msgstr "Vue d'ensemble"
+msgstr "Vue d\\'ensemble"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:49
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:90
@@ -329,7 +329,7 @@ msgstr "Mot de passe"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:122
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:109
 msgid "Password of Private Key"
-msgstr ""
+msgstr "Mot de passe de la clé privée"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:111
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:95
@@ -339,12 +339,12 @@ msgstr "Chemin vers le certificat CA"
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:114
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:99
 msgid "Path to Client-Certificate"
-msgstr ""
+msgstr "Chemin du certificat-client"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:118
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:104
 msgid "Path to Private Key"
-msgstr ""
+msgstr "Chemin de la clé privée"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:69
 msgid "ProActive Uplink Switch"
@@ -370,7 +370,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:134
 msgid "Remove"
-msgstr ""
+msgstr "Désinstaller"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:134
 msgid "Remove this Uplink"
@@ -383,7 +383,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:15
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:149
 msgid "Restart"
-msgstr ""
+msgstr "Redémarrer"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:147
 msgid "Restart Travelmate"
@@ -425,7 +425,7 @@ msgstr "Enregistrer"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:148
 msgid "Scan"
-msgstr ""
+msgstr "Scan"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
diff --git a/applications/luci-app-travelmate/po/ro/travelmate.po b/applications/luci-app-travelmate/po/ro/travelmate.po
index 9408ac55a0..d8bc142a22 100644
--- a/applications/luci-app-travelmate/po/ro/travelmate.po
+++ b/applications/luci-app-travelmate/po/ro/travelmate.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-05 07:43+0000\n"
-"Last-Translator: olimpiumarius <oliver_magnum44@yahoo.com>\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/"
 "luciapplicationstravelmate/ro/>\n"
 "Language: ro\n"
@@ -9,7 +9,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-travelmate/luasrc/view/travelmate/runtime.htm:206
 msgid "AP on"
@@ -39,7 +39,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:21
 msgid "Advanced"
-msgstr ""
+msgstr "Avansat"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
@@ -191,7 +191,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
-msgstr ""
+msgstr "Opțiuni suplimentare"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:128
 msgid "Faulty Stations"
@@ -251,7 +251,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/cfg_wireless_tab.lua:9
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/configuration_tab.lua:9
 msgid "Input file not found, please check your configuration."
-msgstr ""
+msgstr "Fișierul de intrare nu a fost găsit, vă rugăm verificaţi configuraţia."
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
@@ -263,7 +263,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:140
 msgid "Last Run"
-msgstr ""
+msgstr "Ultima rulare"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
@@ -271,7 +271,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:62
 msgid "Loading"
-msgstr "Incarcare"
+msgstr "Încărcare"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:130
 msgid ""
@@ -315,7 +315,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:18
 msgid "Overview"
-msgstr ""
+msgstr "Prezentare generală"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:49
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:90
@@ -421,7 +421,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:14
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:11
 msgid "Save"
-msgstr ""
+msgstr "Salvează"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:148
 msgid "Scan"
diff --git a/applications/luci-app-travelmate/po/sk/travelmate.po b/applications/luci-app-travelmate/po/sk/travelmate.po
index 527acaf23b..75dea06980 100644
--- a/applications/luci-app-travelmate/po/sk/travelmate.po
+++ b/applications/luci-app-travelmate/po/sk/travelmate.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/"
+"luciapplicationstravelmate/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-travelmate/luasrc/view/travelmate/runtime.htm:206
 msgid "AP on"
@@ -11,7 +17,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:113
 #: applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm:38
 msgid "Action"
-msgstr ""
+msgstr "Akcia"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
 msgid "Add Open Uplinks"
@@ -32,7 +38,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:21
 msgid "Advanced"
-msgstr ""
+msgstr "Pokročilé"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
@@ -184,7 +190,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:100
 msgid "Extra Options"
-msgstr ""
+msgstr "Ďalšie možnosti"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:128
 msgid "Faulty Stations"