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-ahcp/po | |
| 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-ahcp/po')
| -rw-r--r-- | applications/luci-app-ahcp/po/zh_Hans/ahcp.po | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/applications/luci-app-ahcp/po/zh_Hans/ahcp.po b/applications/luci-app-ahcp/po/zh_Hans/ahcp.po index c42f28cfae..ff1cc6458c 100644 --- a/applications/luci-app-ahcp/po/zh_Hans/ahcp.po +++ b/applications/luci-app-ahcp/po/zh_Hans/ahcp.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2020-05-10 12:47+0000\n" -"Last-Translator: gw826943555 <gw826943555@qq.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/luciapplicationsahcp/zh_Hans/>\n" "Language: zh_Hans\n" @@ -13,7 +13,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.1-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-ahcp/luasrc/controller/ahcp.lua:11 #: applications/luci-app-ahcp/luasrc/model/cbi/ahcp.lua:4 @@ -27,9 +27,8 @@ msgid "" "networks where it is difficult or impossible to configure a server within " "every link-layer broadcast domain, for example mobile ad-hoc networks." msgstr "" -"AHCP 是一个自动配置 IPv6 和 IPv6/IPv4 双栈网络的协议，用于在网络上进行路由探" -"测和地址分配。因为在某些网络上为每个链路层广播域均配置服务器是非常困难的，例" -"如移动 ad-hoc 网络。" +"AHCP是一种用于IPv6和双栈IPv6/IPv4网络的自动配置协议，它被用来在很难或不可能在每个链路层广播域中配置服务器的网络中代替路由发现或DHCP，" +" 比如移动自组网。" #: applications/luci-app-ahcp/luasrc/view/ahcp_status.htm:34 msgid "Active AHCP Leases" |