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-bmx7 | |
| 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-bmx7')
| -rw-r--r-- | applications/luci-app-bmx7/po/zh_Hans/bmx7.po | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/applications/luci-app-bmx7/po/zh_Hans/bmx7.po b/applications/luci-app-bmx7/po/zh_Hans/bmx7.po index f5e29c10df..ed8aa60d34 100644 --- a/applications/luci-app-bmx7/po/zh_Hans/bmx7.po +++ b/applications/luci-app-bmx7/po/zh_Hans/bmx7.po @@ -1,14 +1,14 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-02-19 20:00+0000\n" -"Last-Translator: xiazhang <xz@xia.plus>\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/luciapplicationsbmx7/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 3.11\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:33 msgid "Announcements" @@ -160,18 +160,18 @@ msgstr "路由表" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:9 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/nodes_j.htm:77 msgid "S/s/T/t" -msgstr "" +msgstr "S/s/T/t" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:26 msgid "Short DHash" -msgstr "" +msgstr "短分布式哈希" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/admin_status/index/bmx7_nodes.htm:8 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/nodes_j.htm:76 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:22 #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:75 msgid "Short ID" -msgstr "Short ID" +msgstr "短 ID" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:58 msgid "State" @@ -191,7 +191,7 @@ msgstr "发射率" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/tunnels_j.htm:44 msgid "Tun Metric" -msgstr "" +msgstr "Tun 度量标准" #: applications/luci-app-bmx7/root/usr/lib/lua/luci/view/bmx7/status_j.htm:42 msgid "Tunnelled IPv4 address" |