treewide: fix conflicts with weblate

Merge remote-tracking branch 'weblate/master' after fixing
modules/luci-base/po/ja/base.po

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

3 files changed, 35 insertions, 25 deletions

diff --git a/applications/luci-app-vpn-policy-routing/po/ru/vpn-policy-routing.po b/applications/luci-app-vpn-policy-routing/po/ru/vpn-policy-routing.po
index ba613c5848..be5989fdf1 100644
--- a/applications/luci-app-vpn-policy-routing/po/ru/vpn-policy-routing.po
+++ b/applications/luci-app-vpn-policy-routing/po/ru/vpn-policy-routing.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-10-09 00:10+0000\n"
-"Last-Translator: Artem <KovalevArtem.ru@gmail.com>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: Andrey Yukhimchak <yukhymchak.a@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsvpn-policy-routing/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 4.3-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:63
 msgid "%s (disabled)"
@@ -29,6 +29,9 @@ msgid ""
 "anything in this section! Change any of the settings below with extreme "
 "caution!%s"
 msgstr ""
+"%sWARNING:%s Пожалуйста ознакомьтесь с %sREADME%s перед любыми изменениями в "
+"этой секции! Любые изменения в настройках ниже проводите с предельной "
+"осторожностью!%s"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:214
 msgid ""
@@ -46,6 +49,9 @@ msgid ""
 "explicitly supported by the service. Can be useful if your OpenVPN tunnels "
 "have dev option other than tun* or tap*."
 msgstr ""
+"Позволяет указать список имен интерфейсов (в нижнем регистре) для явной "
+"поддержки службой. Может быть полезно если ваши OpenVPN тоннели "
+"сконфигурированы с переменной разработчика отличной от tun* или tap*."
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:202
 msgid ""
@@ -53,18 +59,21 @@ msgid ""
 "by the service. Can be useful if running both VPN server and VPN client on "
 "the router."
 msgstr ""
+"Позволяет указать список имен интерфейсов (в нижнем регистре) для "
+"игнорирования службой. Может быть полезно если VPN сервер и VPN клиент "
+"запущены на одном маршрутизаторе."
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:210
 msgid "Append"
-msgstr ""
+msgstr "Добавить"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:227
 msgid "Append local IP Tables rules"
-msgstr ""
+msgstr "Добавить локальные правила IP Tables"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:230
 msgid "Append remote IP Tables rules"
-msgstr ""
+msgstr "Добавить удалённые правила IP Tables"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:164
 msgid "Basic Configuration"
@@ -92,7 +101,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:168
 msgid "Condensed output"
-msgstr ""
+msgstr "Сжатый вывод"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:159
 msgid "Configuration"
@@ -101,6 +110,7 @@ msgstr "Конфигурация"
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:166
 msgid "Controls both system log and console output verbosity."
 msgstr ""
+"Управляет уровнем подробности для системного журнала и вывода в консоль."
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:372
 msgid "Custom User File Includes"
@@ -135,11 +145,11 @@ msgstr "Отключено"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
 msgid "Display these protocols in protocol column in Web UI."
-msgstr ""
+msgstr "Отображать эти протоколы в строке протоколов Web UI."
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:174
 msgid "Do not enforce policies when their gateway is down"
-msgstr ""
+msgstr "Не применять политики когда их шлюз отключен"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:54
 msgid "Enable"
diff --git a/applications/luci-app-vpn-policy-routing/po/sv/vpn-policy-routing.po b/applications/luci-app-vpn-policy-routing/po/sv/vpn-policy-routing.po
index 68fa109421..1f82cfdb10 100644
--- a/applications/luci-app-vpn-policy-routing/po/sv/vpn-policy-routing.po
+++ b/applications/luci-app-vpn-policy-routing/po/sv/vpn-policy-routing.po
@@ -1,18 +1,18 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-09-23 14:41+0000\n"
-"Last-Translator: Kristoffer Grundström <dsmusicever@gmail.com>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: PontusÖsterlindh <pontus@osterlindh.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsvpn-policy-routing/sv/>\n"
 "Language: sv\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 4.3-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:63
 msgid "%s (disabled)"
-msgstr ""
+msgstr "%s (inaktiverad)"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:58
 msgid "%s (strict mode)"
@@ -244,7 +244,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm:44
 msgid "Restart"
-msgstr ""
+msgstr "Starta om"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:373
 msgid ""
@@ -254,7 +254,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:56
 msgid "Running"
-msgstr ""
+msgstr "Igång"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:173
 msgid "See the %sREADME%s for details."
diff --git a/applications/luci-app-vpn-policy-routing/po/zh_Hans/vpn-policy-routing.po b/applications/luci-app-vpn-policy-routing/po/zh_Hans/vpn-policy-routing.po
index 0a1890abc3..cbe85664e3 100644
--- a/applications/luci-app-vpn-policy-routing/po/zh_Hans/vpn-policy-routing.po
+++ b/applications/luci-app-vpn-policy-routing/po/zh_Hans/vpn-policy-routing.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2020-07-31 18:42+0000\n"
-"Last-Translator: Zkdc <Zkdc2345@qq.com>\n"
+"PO-Revision-Date: 2020-11-22 15:35+0000\n"
+"Last-Translator: Eric <spice2wolf@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "openwrt/luciapplicationsvpn-policy-routing/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.2-dev\n"
+"X-Generator: Weblate 4.4-dev\n"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:63
 msgid "%s (disabled)"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:52
 msgid "%s is not installed or not found"
-msgstr ""
+msgstr "%s 未安装或找不到"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:197
 msgid ""
@@ -37,7 +37,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:196
 msgid "Advanced Configuration"
-msgstr ""
+msgstr "高级配置"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:199
 msgid ""
@@ -67,7 +67,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:164
 msgid "Basic Configuration"
-msgstr ""
+msgstr "基本配置"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:205
 msgid "Boot Time-out"
@@ -79,7 +79,7 @@ msgstr "链"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:289
 msgid "Comment"
-msgstr ""
+msgstr "注解"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:272
 msgid ""
@@ -228,7 +228,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:272
 msgid "Policies"
-msgstr ""
+msgstr "策略"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:318
 msgid "Protocol"
@@ -283,7 +283,7 @@ msgstr "服务状态"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:134
 msgid "Service Status [%s %s]"
-msgstr ""
+msgstr "服务状态 [%s %s]"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:149
 msgid "Service Warnings"
@@ -426,7 +426,7 @@ msgstr ""
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:169
 msgid "Verbose output"
-msgstr ""
+msgstr "详细输出"
 
 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:220
 msgid "WAN"