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>

1 files changed, 22 insertions, 18 deletions

diff --git a/applications/luci-app-vpnbypass/po/sv/vpnbypass.po b/applications/luci-app-vpnbypass/po/sv/vpnbypass.po
index 97a7130ebf..f2b6a227f1 100644
--- a/applications/luci-app-vpnbypass/po/sv/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/sv/vpnbypass.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/"
 "luciapplicationsvpnbypass/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-vpnbypass/luasrc/model/cbi/vpnbypass.lua:40
 msgid "%s (disabled)"
-msgstr ""
+msgstr "%s (inaktiverad)"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:24
 msgid "%s is not installed or not found"
@@ -24,13 +24,14 @@ msgstr "Inaktivera"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:88
 msgid "Domains to Bypass"
-msgstr ""
+msgstr "Domäner att kringgå"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:89
 msgid ""
 "Domains to be accessed directly (outside of the VPN tunnel), see %sREADME%s "
 "for syntax"
 msgstr ""
+"Domäner som kan nås direkt (utanför VPN-tunneln), se %sLÄS MIG%s för syntax"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:54
 msgid "Enable"
@@ -38,7 +39,7 @@ msgstr "Aktivera"
 
 #: applications/luci-app-vpnbypass/root/usr/share/rpcd/acl.d/luci-app-vpnbypass.json:3
 msgid "Grant UCI and file access for luci-app-vpnbypass"
-msgstr ""
+msgstr "Bevilja UCI och filåtkomst för luci-app-vpnbypass"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm:51
 msgid "Loading"
@@ -46,47 +47,50 @@ msgstr "Laddar"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid "Local IP Addresses to Bypass"
-msgstr ""
+msgstr "Lokala IP-adresser för att kringgå"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:71
 msgid ""
 "Local IP addresses or subnets with direct internet access (outside of the "
 "VPN tunnel)"
 msgstr ""
+"Lokala IP-adresser eller subnät med direkt internetåtkomst (utanför VPN-"
+"tunneln)"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:57
 msgid "Local Ports to Bypass"
-msgstr ""
+msgstr "Lokala portar som skall kringgås"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:57
 msgid "Local ports to trigger VPN Bypass"
-msgstr ""
+msgstr "Lokala portar för att utlösa VPN-förbikoppling"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:78
 msgid "Remote IP Addresses to Bypass"
-msgstr ""
+msgstr "Fjärr-IP-adresser för att förbikoppla"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:78
 msgid ""
 "Remote IP addresses or subnets which will be accessed directly (outside of "
 "the VPN tunnel)"
 msgstr ""
+"Fjärr-IP-adresser eller undernät som kommer åt direkt (utanför VPN-tunneln)"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:64
 msgid "Remote Ports to Bypass"
-msgstr ""
+msgstr "Fjärrportar för förbikoppling"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:64
 msgid "Remote ports to trigger VPN Bypass"
-msgstr ""
+msgstr "Fjärrportar till att trigga VPN-Förbikopplingar"
 
 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:44
 msgid "Restart"
-msgstr ""
+msgstr "Starta om"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36
 msgid "Running"
-msgstr ""
+msgstr "Igång"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:47
 msgid "Service Status"
@@ -110,19 +114,19 @@ msgstr "Stoppad"
 
 #: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4
 msgid "VPN"
-msgstr ""
+msgstr "VPN"
 
 #: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:7
 msgid "VPN Bypass"
-msgstr ""
+msgstr "VPN-förbikoppling"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:55
 msgid "VPN Bypass Rules"
-msgstr ""
+msgstr "Regler för VPN-förbikoppling"
 
 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:44
 msgid "VPN Bypass Settings"
-msgstr ""
+msgstr "Inställningar för VPN-förbikoppling"
 
 #~ msgid "Reload"
 #~ msgstr "Ladda om"