Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

4 files changed, 33 insertions, 29 deletions

diff --git a/applications/luci-app-vpnbypass/po/cs/vpnbypass.po b/applications/luci-app-vpnbypass/po/cs/vpnbypass.po
index 856d474b2e..01ae125323 100644
--- a/applications/luci-app-vpnbypass/po/cs/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/cs/vpnbypass.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-02 16:11+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/"
 "luciapplicationsvpnbypass/cs/>\n"
@@ -16,11 +16,11 @@ msgstr "Zakázat"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:62
 msgid "Domains to Bypass"
-msgstr ""
+msgstr "Domény k přemostění"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:63
 msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
-msgstr ""
+msgstr "Domény, ke kterým chcete přistupovat přímo (mimo VPN tunel), vizte"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:48
 msgid "Enable"
@@ -32,25 +32,27 @@ msgstr "Načítání"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:45
 msgid "Local IP Addresses to Bypass"
-msgstr ""
+msgstr "Lokální IP adresy pro přemostění"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:45
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr ""
+"Lokální IP adresy nebo podsítě s přímým přístupem na internet (mimo VPN "
+"tunel)"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
 msgid "Local Ports to Bypass"
-msgstr ""
+msgstr "Lokální porty k přemostění"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31
 msgid "Local ports to trigger VPN Bypass"
-msgstr ""
+msgstr "Lokální porty pro aktivaci VPN Bypass"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:65
 msgid "README"
-msgstr ""
+msgstr "README"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:40
 msgid "Reload"
@@ -58,26 +60,28 @@ msgstr "Znovu načíst"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:52
 msgid "Remote IP Addresses to Bypass"
-msgstr ""
+msgstr "Vzdálené IP adresy k přemostění"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:52
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
 msgstr ""
+"Vzdálené IP adresy nebo podsítě, ke kterým bude přistupováno přímo (mimo VPN "
+"tunel)"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
 msgid "Remote Ports to Bypass"
-msgstr ""
+msgstr "Vzdálené porty k přemostění"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38
 msgid "Remote ports to trigger VPN Bypass"
-msgstr ""
+msgstr "Vzdálené porty pro aktivaci VPN Bypass"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:22
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:23
 msgid "Service Status"
-msgstr ""
+msgstr "Stav služby"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:38
 msgid "Start"
@@ -89,20 +93,20 @@ msgstr "Zastavit"
 
 #: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4
 msgid "VPN Bypass"
-msgstr ""
+msgstr "VPN Bypass"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:29
 msgid "VPN Bypass Rules"
-msgstr ""
+msgstr "Pravidla VPN Bypass"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:20
 msgid "VPN Bypass Settings"
-msgstr ""
+msgstr "Nastavení VPN Bypass"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:65
 msgid "for syntax"
-msgstr ""
+msgstr "pro syntaxi"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:11
 msgid "is not installed or not found"
-msgstr ""
+msgstr "není nainstalován nebo nenalezen"
diff --git a/applications/luci-app-vpnbypass/po/hu/vpnbypass.po b/applications/luci-app-vpnbypass/po/hu/vpnbypass.po
index a2a98a3b39..64b526c7b3 100644
--- a/applications/luci-app-vpnbypass/po/hu/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/hu/vpnbypass.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-10 23:15+0000\n"
+"PO-Revision-Date: 2019-12-21 21:43+0000\n"
 "Last-Translator: Balázs Úr <balazs@urbalazs.hu>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsvpnbypass/hu/>\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-vpnbypass/luasrc/view/vpnbypass/buttons.htm:50
 msgid "Disable"
@@ -77,7 +77,7 @@ msgstr ""
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:22
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:23
 msgid "Service Status"
-msgstr ""
+msgstr "Szolgáltatás állapota"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:38
 msgid "Start"
@@ -105,4 +105,4 @@ msgstr ""
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:11
 msgid "is not installed or not found"
-msgstr ""
+msgstr "nincs telepítve vagy nem található"
diff --git a/applications/luci-app-vpnbypass/po/mr/vpnbypass.po b/applications/luci-app-vpnbypass/po/mr/vpnbypass.po
index 6100f1c0cd..183e2a37a9 100644
--- a/applications/luci-app-vpnbypass/po/mr/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/mr/vpnbypass.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-12-15 21:23+0000\n"
+"PO-Revision-Date: 2019-12-16 23:26+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsvpnbypass/mr/>\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:48
 msgid "Enable"
-msgstr ""
+msgstr "सक्षम करा"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm:51
 msgid "Loading"
diff --git a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
index 67c140768f..a6946237bb 100644
--- a/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/ru/vpnbypass.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LuCI: vpnbypass\n"
 "POT-Creation-Date: 2018-01-01 21:00+0300\n"
-"PO-Revision-Date: 2019-11-15 03:06+0000\n"
-"Last-Translator: Alex Vinnick <alexv10@gmail.com>\n"
+"PO-Revision-Date: 2019-12-26 18:23+0000\n"
+"Last-Translator: Alex Ky <esthomolupus@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsvpnbypass/ru/>\n"
 "Language: ru\n"
@@ -12,13 +12,13 @@ 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"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:50
 msgid "Disable"
-msgstr ""
+msgstr "Отключить"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:62
 msgid "Domains to Bypass"
@@ -30,7 +30,7 @@ msgstr "Домены должны быть доступны напрямую (в
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:48
 msgid "Enable"
-msgstr ""
+msgstr "Включить"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm:51
 msgid "Loading"
@@ -91,11 +91,11 @@ msgstr ""
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:38
 msgid "Start"
-msgstr ""
+msgstr "Старт"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:42
 msgid "Stop"
-msgstr ""
+msgstr "Остановить"
 
 #: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4
 msgid "VPN Bypass"