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-shadowsocks-libev/po/zh_Hans | |
| 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-shadowsocks-libev/po/zh_Hans')
| -rw-r--r-- | applications/luci-app-shadowsocks-libev/po/zh_Hans/shadowsocks-libev.po | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/applications/luci-app-shadowsocks-libev/po/zh_Hans/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/zh_Hans/shadowsocks-libev.po index 421d89f3f8..4ca7c894c1 100644 --- a/applications/luci-app-shadowsocks-libev/po/zh_Hans/shadowsocks-libev.po +++ b/applications/luci-app-shadowsocks-libev/po/zh_Hans/shadowsocks-libev.po @@ -1,7 +1,7 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-11-04 00:26+0000\n" -"Last-Translator: taotieren <admin@taotieren.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/luciapplicationsshadowsocks-libev/zh_Hans/>\n" "Language: zh_Hans\n" @@ -9,7 +9,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.3.2-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:45 msgid "-- instance type --" @@ -340,15 +340,15 @@ msgstr "转发" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:94 msgid "The IPv4 address ss-server will initiate IPv4 connections from" -msgstr "" +msgstr "ss-server 发起 IPv4 连接的IPv4 地址" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:99 msgid "The IPv6 address ss-server will initiate IPv6 connections from" -msgstr "" +msgstr "ss-server 发起IPv6 连接的IPv6 地址" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:89 msgid "The address ss-server will initiate connections from" -msgstr "" +msgstr "ss-server 发起连接的地址" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:107 msgid "The address ss-tunnel will forward traffic to" |