Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

6 files changed, 70 insertions, 50 deletions

diff --git a/applications/luci-app-banip/po/cs/banip.po b/applications/luci-app-banip/po/cs/banip.po
index c550a6698..f61f79a9f 100644
--- a/applications/luci-app-banip/po/cs/banip.po
+++ b/applications/luci-app-banip/po/cs/banip.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-03 08:26+0000\n"
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
 "Last-Translator: Jiri Tersel <jiri.tersel@seznam.cz>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsbanip/cs/>\n"
@@ -40,13 +40,12 @@ msgid "Backup Directory"
 msgstr "Záložní adresář"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
-#, fuzzy
 msgid ""
 "Blacklist auto addons are stored temporary in the IPSet and saved "
 "permanently in the local blacklist. Disable this option to prevent the local "
 "save."
 msgstr ""
-"Automatické doplňky černé listiny jsou uloženy dočasně v IPSet a trvale "
+"Automatické doplňky do blacklistu jsou uloženy dočasně v IPSet a trvale "
 "uloženy v lokálním seznamu. Chcete-li zabránit místnímu ukládání, zakažte "
 "tuto možnost."
 
@@ -95,7 +94,7 @@ msgstr "Nástroj pro stahování, RT Monitor"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:22
 msgid "Edit Blacklist"
-msgstr "Upravit černou listinu"
+msgstr "Upravit blacklist"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:24
 msgid "Edit Configuration"
@@ -103,7 +102,7 @@ msgstr "Upravit konfiguraci"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:23
 msgid "Edit Whitelist"
-msgstr "Upravit bílou listinu"
+msgstr "Upravit whitelist"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
 msgid "Enable banIP"
@@ -205,11 +204,11 @@ msgstr "Načítání..."
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:114
 msgid "Local Save Blacklist Addons"
-msgstr ""
+msgstr "Ukládat blacklist lokálně"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:119
 msgid "Local Save Whitelist Addons"
-msgstr ""
+msgstr "Ukládat whitelist lokálně"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:87
 msgid "Low Priority Service"
@@ -454,7 +453,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:31
 msgid ""
 "This form allows you to modify the content of the banIP blacklist (%s).<br />"
-msgstr "Tento formulář umožňuje upravit obsah černé listiny banIP (%s).<br />"
+msgstr "Tento formulář umožňuje upravit obsah blacklistu banIP (%s).<br />"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua:31
 msgid ""
@@ -505,9 +504,9 @@ msgid ""
 "permanently in the local whitelist. Disable this option to prevent the local "
 "save."
 msgstr ""
-"Automatické doplňky seznamu povolených serverů jsou uloženy dočasně v IPSet "
-"a trvale uloženy v místním seznamu. Chcete-li zabránit místnímu ukládání, "
-"zakažte tuto možnost."
+"Automatické doplňky do seznamu povolených serverů (whitelist) jsou uloženy "
+"dočasně v IPSet a trvale uloženy v místním seznamu. Chcete-li zabránit "
+"místnímu ukládání, zakažte tuto možnost."
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:93
 msgid "Whois Information"
diff --git a/applications/luci-app-banip/po/fr/banip.po b/applications/luci-app-banip/po/fr/banip.po
index a26f9bcc2..2c434381e 100644
--- a/applications/luci-app-banip/po/fr/banip.po
+++ b/applications/luci-app-banip/po/fr/banip.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-09 20:04+0000\n"
-"Last-Translator: Guillaume D. <2a3b@protonmail.com>\n"
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: reyur <remicaruyer@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsbanip/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-banip/luasrc/view/banip/ripeview.htm:89
 #, fuzzy
@@ -445,7 +445,7 @@ msgstr "Délai de déclenchement"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
 msgid "Verbose Debug Logging"
-msgstr ""
+msgstr "Logs en mode verbeux"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:20
 msgid "View Logfile"
diff --git a/applications/luci-app-banip/po/ms/banip.po b/applications/luci-app-banip/po/ms/banip.po
index 4ce191c22..d3b200d59 100644
--- a/applications/luci-app-banip/po/ms/banip.po
+++ b/applications/luci-app-banip/po/ms/banip.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-18 04:21+0000\n"
+"Last-Translator: Pusak Hitam <thegame.gamesky@gmail.com>\n"
+"Language-Team: Malay <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsbanip/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-banip/luasrc/view/banip/ripeview.htm:89
 msgid "ASN Overview"
@@ -22,7 +28,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:21
 msgid "Advanced"
-msgstr ""
+msgstr "Lanjutan"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:24
 msgid "Automatic WAN Interface Detection"
@@ -31,7 +37,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:94
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
 msgid "Backup Directory"
-msgstr ""
+msgstr "Direktori Sandaran"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
 msgid ""
@@ -67,7 +73,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:72
 msgid "Description"
-msgstr ""
+msgstr "Keterangan"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
 msgid "Download Options"
diff --git a/applications/luci-app-banip/po/pt_BR/banip.po b/applications/luci-app-banip/po/pt_BR/banip.po
index 24d44143b..990de9d85 100644
--- a/applications/luci-app-banip/po/pt_BR/banip.po
+++ b/applications/luci-app-banip/po/pt_BR/banip.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-03 08:26+0000\n"
+"PO-Revision-Date: 2019-12-20 21:22+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsbanip/pt_BR/>\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-banip/luasrc/view/banip/ripeview.htm:89
 msgid "ASN Overview"
@@ -162,7 +162,7 @@ msgstr "Fontes IPSet"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:18
 msgid "IPSet-Lookup"
-msgstr "IPSet-Lookup"
+msgstr "Varredura-IPSet"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:10
 #: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:9
@@ -259,7 +259,7 @@ msgstr "Por favor, edite esse arquivo diretamente em uma sessão de terminal."
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:19
 msgid "RIPE-Lookup"
-msgstr "RIPE-Lookup"
+msgstr "Varredura-RIPE"
 
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:18
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:153
@@ -529,7 +529,7 @@ msgstr "Informação Whois"
 #: applications/luci-app-banip/luasrc/controller/banip.lua:16
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:10
 msgid "banIP"
-msgstr "banIP"
+msgstr "Banir IP"
 
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:114
 msgid "banIP Status"
diff --git a/applications/luci-app-banip/po/ru/banip.po b/applications/luci-app-banip/po/ru/banip.po
index d47440cff..ce6e41cd5 100644
--- a/applications/luci-app-banip/po/ru/banip.po
+++ b/applications/luci-app-banip/po/ru/banip.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-15 03:06+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/"
 "luciapplicationsbanip/ru/>\n"
 "Language: ru\n"
@@ -9,7 +9,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"
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:89
 msgid "ASN Overview"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:21
 msgid "Advanced"
-msgstr ""
+msgstr "Дополнительно"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:24
 msgid "Automatic WAN Interface Detection"
@@ -38,7 +38,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:94
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
 msgid "Backup Directory"
-msgstr ""
+msgstr "Папка для резервных копий"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
 msgid ""
@@ -74,7 +74,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:72
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
 msgid "Download Options"
@@ -90,15 +90,15 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:22
 msgid "Edit Blacklist"
-msgstr ""
+msgstr "Редактировать Черный список"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:24
 msgid "Edit Configuration"
-msgstr ""
+msgstr "Редактировать config файл"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:23
 msgid "Edit Whitelist"
-msgstr ""
+msgstr "Редактировать Белый список"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:20
 msgid "Enable banIP"
@@ -107,6 +107,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:84
 msgid "Enable verbose debug logging in case of any processing error."
 msgstr ""
+"Включить ведение подробного журнала для отладки в случае ошибок обработки."
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:82
 msgid "Enter IP/CIDR/ASN/ISO"
@@ -121,12 +122,16 @@ msgid ""
 "For further information <a href=\"%s\" target=\"_blank\">check the online "
 "documentation</a>"
 msgstr ""
+"<br />Для получения дополнительной информации <a href=\"%s\" target=\""
+"_blank\"> смотрите онлайн документацию</a>."
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:102
 msgid ""
 "For further performance improvements you can raise this value, e.g. '8' or "
 "'16' should be safe."
 msgstr ""
+"<br />Для повышения производительности вы можете увеличить это значение, "
+"например значения '8' или '16' должны быть безопасными."
 
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:88
 msgid "Geo Location"
@@ -156,7 +161,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:9
 #: applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua:10
 msgid "Input file not found, please check your configuration."
-msgstr ""
+msgstr "Config файл не найден, пожалуйста, проверьте ваши настройки."
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:166
 msgid "LAN Forward Chain IPv4"
@@ -176,12 +181,12 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:144
 msgid "Last Run"
-msgstr ""
+msgstr "Последний запуск"
 
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:59
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:97
 msgid "Load"
-msgstr ""
+msgstr "Загрузка"
 
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:81
 msgid "Loading"
@@ -202,7 +207,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:87
 msgid "Low Priority Service"
-msgstr ""
+msgstr "Низкий приоритет службы"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:28
 msgid "Manual WAN Interface Selection"
@@ -210,7 +215,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:100
 msgid "Max. Download Queue"
-msgstr ""
+msgstr "Макс. очередь загрузки"
 
 #: applications/luci-app-banip/luasrc/view/banip/ipsetview.htm:34
 #: applications/luci-app-banip/luasrc/view/banip/ripeview.htm:65
@@ -221,10 +226,12 @@ msgstr ""
 msgid ""
 "Options for further tweaking in case the defaults are not suitable for you."
 msgstr ""
+"Возможные варианты детальной настройки, если значения по умолчанию не "
+"подходят для вас."
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:17
 msgid "Overview"
-msgstr ""
+msgstr "Главное меню"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua:32
 #: applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua:32
@@ -237,7 +244,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:18
 #: applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua:19
 msgid "Please edit this file directly in a terminal session."
-msgstr ""
+msgstr "Редактируйте данный файл только в терминале."
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:19
 msgid "RIPE-Lookup"
@@ -263,7 +270,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:112
 msgid "Runtime Information"
-msgstr ""
+msgstr "Информация о состоянии"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:171
 msgid "SRC Target IPv4"
@@ -289,7 +296,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua:26
 #: applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua:27
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:108
 msgid "Select the SSH daemon for logfile parsing, to detect break-in events."
@@ -356,6 +363,8 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua:18
 msgid "The file size is too large for online editing in LuCI (&ge; 100 KB)."
 msgstr ""
+"Этот файл слишком большой для редактирования в Web-интерфейсе LuCI (&ge; 100 "
+"KB)."
 
 #: applications/luci-app-banip/luasrc/view/banip/logview.htm:31
 msgid "The syslog output, pre-filtered for banIP related messages only."
@@ -427,11 +436,11 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:138
 msgid "Trigger Delay"
-msgstr ""
+msgstr "Задержка запуска"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:83
 msgid "Verbose Debug Logging"
-msgstr ""
+msgstr "Подробный журнал отладки"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:20
 msgid "View Logfile"
diff --git a/applications/luci-app-banip/po/zh-tw/banip.po b/applications/luci-app-banip/po/zh-tw/banip.po
index ff1aad9b1..ed01bca7e 100644
--- a/applications/luci-app-banip/po/zh-tw/banip.po
+++ b/applications/luci-app-banip/po/zh-tw/banip.po
@@ -1,8 +1,14 @@
 msgid ""
 msgstr ""
-"Language: zh_Hant\n"
+"PO-Revision-Date: 2019-12-19 19:40+0000\n"
+"Last-Translator: 孤爺仔 <7312140@qq.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"openwrt/luciapplicationsbanip/zh_Hant/>\n"
+"Language: zh-tw\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-banip/luasrc/view/banip/ripeview.htm:89
 msgid "ASN Overview"
@@ -22,7 +28,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:21
 msgid "Advanced"
-msgstr ""
+msgstr "進階"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:24
 msgid "Automatic WAN Interface Detection"
@@ -31,7 +37,7 @@ msgstr ""
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:94
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:138
 msgid "Backup Directory"
-msgstr ""
+msgstr "備份目錄"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:115
 msgid ""
@@ -67,7 +73,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:72
 msgid "Description"
-msgstr ""
+msgstr "說明"
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:134
 msgid "Download Options"
@@ -75,7 +81,7 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua:126
 msgid "Download Utility"
-msgstr ""
+msgstr "下載實用程式"
 
 #: applications/luci-app-banip/luasrc/view/banip/runtime.htm:126
 msgid "Download Utility, RT Monitor"
@@ -83,11 +89,11 @@ msgstr ""
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:22
 msgid "Edit Blacklist"
-msgstr ""
+msgstr "編輯拉黑檔案"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:24
 msgid "Edit Configuration"
-msgstr ""
+msgstr "編輯設定"
 
 #: applications/luci-app-banip/luasrc/controller/banip.lua:23
 msgid "Edit Whitelist"