po: rebase ahcp and base translations against updated templates

2 files changed, 29 insertions, 10 deletions

diff --git a/po/zh_CN/ahcp.po b/po/zh_CN/ahcp.po
index 4ee4f4d65..f94a50f62 100644
--- a/po/zh_CN/ahcp.po
+++ b/po/zh_CN/ahcp.po
@@ -4,10 +4,10 @@ msgstr ""
 "PO-Revision-Date: 2012-02-06 09:10+0200\n"
 "Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
 "Language-Team: none\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.4\n"
 
@@ -20,8 +20,9 @@ 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双栈网络的协议，用于网络上的路由探测和DHCP"
-"。因为在某些网络上为每个链路层广播域均配置服务器是非常困难的，例如移动ad-hoc网络。"
+"AHCP是一个自动配置IPv6和IPv6/IPv4双栈网络的协议，用于网络上的路由探测和DHCP。"
+"因为在某些网络上为每个链路层广播域均配置服务器是非常困难的，例如移动ad-hoc网"
+"络。"
 
 msgid "Active AHCP Leases"
 msgstr "活动AHCP客户端"
@@ -98,6 +99,12 @@ msgstr "指定宣告的IPv4和IPv6域名服务器"
 msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
 msgstr "以CIDR表示法宣告IPv4和IPv6网络前缀"
 
+msgid "The AHCP Service is not running."
+msgstr ""
+
+msgid "The AHCP Service is running with ID %s."
+msgstr ""
+
 msgid "There are no active leases."
 msgstr "当前无活动客户端"
 
diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index 1f4dc0f74..d5c2fa693 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -6,10 +6,10 @@ msgstr ""
 "PO-Revision-Date: 2012-02-03 15:17+0200\n"
 "Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
 "Language-Team: QQ Group:75543259\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.4\n"
 
@@ -1501,6 +1501,9 @@ msgstr "Normal"
 msgid "Not associated"
 msgstr "未关联"
 
+msgid "Not connected"
+msgstr ""
+
 msgid "Note: Configuration files will be erased."
 msgstr "注意：配置文件将被删除。"
 
@@ -1529,9 +1532,10 @@ msgid ""
 "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
 "<samp>eth0.1</samp>)."
 msgstr ""
-"本页可配置网络接口。选中\"桥接接口\"可把几个接口组合配置成网桥，自定义添加的多个接口名须用空格隔开，也可用<samp>INTERFACE.VLANNR<"
-"/samp>来标记<abbr title=\"Virtual Local Area Network\">VLAN</abbr>()。(<abbr "
-"title=\"for example\">例如</abbr>:<samp>eth0.1</samp>)。"
+"本页可配置网络接口。选中\"桥接接口\"可把几个接口组合配置成网桥，自定义添加的"
+"多个接口名须用空格隔开，也可用<samp>INTERFACE.VLANNR</samp>来标记<abbr title="
+"\"Virtual Local Area Network\">VLAN</abbr>()。(<abbr title=\"for example\">例"
+"如</abbr>:<samp>eth0.1</samp>)。"
 
 msgid "On-State Delay"
 msgstr "通态延迟"
@@ -1738,6 +1742,9 @@ msgstr "RTS/CTS阈值"
 msgid "RX"
 msgstr "接收"
 
+msgid "RX Rate"
+msgstr ""
+
 msgid "Radius-Accounting-Port"
 msgstr "Radius-Accounting-Port"
 
@@ -2169,6 +2176,9 @@ msgstr "TFTP服务器根"
 msgid "TX"
 msgstr "发送"
 
+msgid "TX Rate"
+msgstr ""
+
 msgid "Table"
 msgstr "表格"
 
@@ -2268,8 +2278,8 @@ msgid ""
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
-"正在刷新系统...<br />切勿关闭电源! DO NOT POWER OFF THE DEVICE!<br "
-"/>稍等数分钟即可重新连接到路由。可能需要更改计算机的IP地址以重新连接。"
+"正在刷新系统...<br />切勿关闭电源! DO NOT POWER OFF THE DEVICE!<br />稍等数分"
+"钟即可重新连接到路由。可能需要更改计算机的IP地址以重新连接。"
 
 msgid ""
 "The uploaded image file does not contain a supported format. Make sure that "
@@ -2312,7 +2322,9 @@ msgstr "这是32 byte hex编码的用户ID，不是登录名"
 msgid ""
 "This is the content of /etc/rc.local. Insert your own commands here (in "
 "front of 'exit 0') to execute them at the end of the boot process."
-msgstr "此处显示了/etc/rc.local的内容。将自定义的命令插入到('exit 0')之前，即可在系统启动完成时自动运行。"
+msgstr ""
+"此处显示了/etc/rc.local的内容。将自定义的命令插入到('exit 0')之前，即可在系统"
+"启动完成时自动运行。"
 
 msgid ""
 "This is the local endpoint address assigned by the tunnel broker, it usually "