diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
---|---|---|
committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
commit | 87d64ee27978ad008743e69e2e1c198e89a598ff (patch) | |
tree | 5579fb973a11bc80430f2821928b2178d82a0b04 /applications/luci-app-openvpn | |
parent | 0f3f464adc9e24646638aa5d71edb995a352dec5 (diff) | |
parent | 06dcfeffa03b2cfa5a2b739f603d98b67a5786bd (diff) |
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>
Diffstat (limited to 'applications/luci-app-openvpn')
-rw-r--r-- | applications/luci-app-openvpn/po/sv/openvpn.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-openvpn/po/sv/openvpn.po b/applications/luci-app-openvpn/po/sv/openvpn.po index e09e9e1daa..652da7752e 100644 --- a/applications/luci-app-openvpn/po/sv/openvpn.po +++ b/applications/luci-app-openvpn/po/sv/openvpn.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2019-10-17 20:20+0000\n" -"Last-Translator: Mattias MĂĽnster <mattiasmun@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/" "luciapplicationsopenvpn/sv/>\n" "Language: sv\n" @@ -10,7 +10,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.9.1-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:364 msgid "'net30', 'p2p', or 'subnet'" @@ -787,7 +787,7 @@ msgstr "" #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:368 msgid "VPN" -msgstr "" +msgstr "VPN" #: applications/luci-app-openvpn/luasrc/model/cbi/openvpn-advanced.lua:64 msgid "Write log to file" |