Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

5 files changed, 38 insertions, 31 deletions

diff --git a/applications/luci-app-travelmate/po/hu/travelmate.po b/applications/luci-app-travelmate/po/hu/travelmate.po
index 11cc2dab70..4731ed61cb 100644
--- a/applications/luci-app-travelmate/po/hu/travelmate.po
+++ b/applications/luci-app-travelmate/po/hu/travelmate.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-13 23:07+0000\n"
+"PO-Revision-Date: 2019-12-16 23:25+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationstravelmate/hu/>\n"
@@ -55,7 +55,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:61
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:126
 msgid "Automatic"
-msgstr ""
+msgstr "Automatikus"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:75
 msgid ""
@@ -100,7 +100,7 @@ msgstr ""
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:60
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:125
 msgid "Cipher"
-msgstr ""
+msgstr "Titkosító"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:14
 msgid ""
@@ -127,12 +127,12 @@ msgstr "Eszköz"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:132
 msgid "Down"
-msgstr ""
+msgstr "Le"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:85
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:67
 msgid "EAP-Method"
-msgstr ""
+msgstr "EAP módszer"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:133
 msgid "Edit"
@@ -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 "Személyazonosság"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:46
 msgid "Ignore BSSID"
@@ -341,7 +341,7 @@ msgstr "Útvonal a CA-tanúsítványhoz"
 #: 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 "Útvonal az ügyféltanúsítványhoz"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:118
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:104
@@ -426,7 +426,7 @@ msgstr "Mentés"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:148
 msgid "Scan"
-msgstr ""
+msgstr "Keresés"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:147
 msgid "Scan Buffer Size"
diff --git a/applications/luci-app-travelmate/po/ms/travelmate.po b/applications/luci-app-travelmate/po/ms/travelmate.po
index b0e3243cc8..63546e6bda 100644
--- a/applications/luci-app-travelmate/po/ms/travelmate.po
+++ b/applications/luci-app-travelmate/po/ms/travelmate.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-16 23:25+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationstravelmate/ms/>\n"
 "Language: ms\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.10-dev\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 "Tindakan"
 
 #: 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 "Lanjutan"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74
diff --git a/applications/luci-app-travelmate/po/pt-br/travelmate.po b/applications/luci-app-travelmate/po/pt-br/travelmate.po
index c04b436d69..7d1a78badc 100644
--- a/applications/luci-app-travelmate/po/pt-br/travelmate.po
+++ b/applications/luci-app-travelmate/po/pt-br/travelmate.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-12-03 08:25+0000\n"
+"PO-Revision-Date: 2019-12-18 04:21+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationstravelmate/pt_BR/>\n"
@@ -231,21 +231,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 "Forçar CCMP (AES)"
+msgstr "Impor 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 "Forçar TKIP"
+msgstr "Impor 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 "Forçar TKIP e CCMP (AES)"
+msgstr "Impor TKIP e CCMP (AES)"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:136
 msgid ""
diff --git a/applications/luci-app-travelmate/po/ru/travelmate.po b/applications/luci-app-travelmate/po/ru/travelmate.po
index 26c3069163..d0a10dd9eb 100644
--- a/applications/luci-app-travelmate/po/ru/travelmate.po
+++ b/applications/luci-app-travelmate/po/ru/travelmate.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: travelmate\n"
 "POT-Creation-Date: 2017-12-07 21:00+0300\n"
-"PO-Revision-Date: 2019-11-15 03:05+0000\n"
-"Last-Translator: Alex Vinnick <alexv10@gmail.com>\n"
+"PO-Revision-Date: 2019-12-27 01:11+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationstravelmate/ru/>\n"
 "Language: ru\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10-dev\n"
+"X-Generator: Weblate 3.10\n"
 "Project-Info: Это технический перевод, не дословный. Главное-удобный русский "
 "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n"
 
@@ -135,7 +135,7 @@ msgstr "Устройство"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:132
 msgid "Down"
-msgstr ""
+msgstr "Вниз"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:85
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:67
@@ -260,7 +260,7 @@ msgstr "Игнорировать BSSID"
 #: 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 "Config файл не найден, настройте config файл."
+msgstr "Config файл не найден, пожалуйста, проверьте ваши настройки."
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:135
 msgid "Interface Timeout"
@@ -272,7 +272,7 @@ msgstr "Помощник настройки интерфейса"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:140
 msgid "Last Run"
-msgstr ""
+msgstr "Последний запуск"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:111
 msgid "List Auto Expiry"
@@ -382,7 +382,7 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:134
 msgid "Remove"
-msgstr ""
+msgstr "Удалить"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:134
 msgid "Remove this Uplink"
@@ -395,7 +395,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 "Перезапустить"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:147
 msgid "Restart Travelmate"
@@ -535,11 +535,11 @@ msgstr ""
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:117
 msgid "Trigger Delay"
-msgstr ""
+msgstr "Задержка запуска"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/stations.htm:131
 msgid "Up"
-msgstr ""
+msgstr "Вверх"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:79
 msgid "Uplink / Trigger interface"
diff --git a/applications/luci-app-travelmate/po/zh-tw/travelmate.po b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
index 696c33ef4e..ea47174c42 100644
--- a/applications/luci-app-travelmate/po/zh-tw/travelmate.po
+++ b/applications/luci-app-travelmate/po/zh-tw/travelmate.po
@@ -5,15 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2019-01-03 21:37+0800\n"
-"Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
-"Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
-"Language: zh_TW\n"
+"PO-Revision-Date: 2019-12-19 19:39+0000\n"
+"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationstravelmate/zh_Hant/>\n"
+"Language: zh-tw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 3.30.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.10-dev\n"
 
 #: applications/luci-app-travelmate/luasrc/view/travelmate/runtime.htm:206
 msgid "AP on"
@@ -22,7 +23,7 @@ msgstr "AP 開啟"
 #: 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 "行動"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/overview_tab.lua:74
 msgid "Add Open Uplinks"
@@ -43,7 +44,7 @@ msgstr "在 travelmate 處理開始前的額外觸發延遲（秒）。"
 
 #: applications/luci-app-travelmate/luasrc/controller/travelmate.lua:21
 msgid "Advanced"
-msgstr "高階"
+msgstr "進階"
 
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua:92
 #: applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua:74