luci-0.10: merge r7133, r7134 and r7135

diff --git a/po/zh_CN/ahcp.po b/po/zh_CN/ahcp.po
index a4588042865b2c3f0a0fdc7d0674642f9018ce7b..88a25708ac8f29d8e2b2e681ee7f6d72b9d0e027 100644 (file)
--- a/po/zh_CN/ahcp.po
+++ b/po/zh_CN/ahcp.po
@@ -1,14 +1,18 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-06-11 13:56+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "AHCP Server"
-msgstr ""
+msgstr "AHCP服务器"
 
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
@@ -16,84 +20,86 @@ 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网络。"
 
 msgid "Active AHCP Leases"
-msgstr ""
+msgstr "活动AHCP客户端"
 
 msgid "Address"
-msgstr ""
+msgstr "地址"
 
 msgid "Advanced Settings"
-msgstr ""
+msgstr "高级设置"
 
 msgid "Age"
-msgstr ""
+msgstr "使用期限"
 
 msgid "Announced DNS servers"
-msgstr ""
+msgstr "宣告的DNS服务器"
 
 msgid "Announced NTP servers"
-msgstr ""
+msgstr "宣告的NTP服务器"
 
 msgid "Announced prefixes"
-msgstr ""
+msgstr "宣告的前缀"
 
 msgid "Collecting data..."
-msgstr ""
+msgstr "收集信息中..."
 
 msgid "Forwarder"
-msgstr ""
+msgstr "转发"
 
 msgid "General Setup"
-msgstr ""
+msgstr "一般设置"
 
 msgid "IPv4 and IPv6"
-msgstr ""
+msgstr "IPv4和IPv6"
 
 msgid "IPv4 only"
-msgstr ""
+msgstr "仅IPv4"
 
 msgid "IPv6 only"
-msgstr ""
+msgstr "仅IPv6"
 
 msgid "Lease directory"
-msgstr ""
+msgstr "租约目录"
 
 msgid "Lease validity time"
-msgstr ""
+msgstr "租用有效时间"
 
 msgid "Log file"
-msgstr ""
+msgstr "日志文件"
 
 msgid "Multicast address"
-msgstr ""
+msgstr "组播地址"
 
 msgid "Operation mode"
-msgstr ""
+msgstr "操作模式"
 
 msgid "Port"
-msgstr ""
+msgstr "端口"
 
 msgid "Protocol family"
-msgstr ""
+msgstr "协议族"
 
 msgid "Served interfaces"
-msgstr ""
+msgstr "服务接口"
 
 msgid "Server"
-msgstr ""
+msgstr "服务器"
 
 msgid "Specifies the announced IPv4 and IPv6 NTP servers"
-msgstr ""
+msgstr "指定宣告的IPv4和IPv6 NTP服务器"
 
 msgid "Specifies the announced IPv4 and IPv6 name servers"
-msgstr ""
+msgstr "指定宣告的IPv4和IPv6域名服务器"
 
 msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
-msgstr ""
+msgstr "在CIDR超网注释中指定宣告的IPv4和IPv6网络前缀"
 
 msgid "There are no active leases."
-msgstr ""
+msgstr "无活动客户端"
 
 msgid "Unique ID file"
-msgstr ""
+msgstr "唯一ID文件"

diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index a2c57911c7dbe5dbef7cfd564969a3bd64accece..5a3c844245d240275d072d299d9011e2288f89e9 100644 (file)
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -161,7 +161,7 @@ msgstr ""
 "器。"
 
 msgid "AHCP Settings"
-msgstr ""
+msgstr "AHCP设置"
 
 msgid "AR Support"
 msgstr "AR支持"
@@ -639,7 +639,7 @@ msgstr ""
 "禁用本接口的<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 
 msgid "Disable DNS setup"
-msgstr ""
+msgstr "禁用DNS设置"
 
 msgid "Disable HW-Beacon timer"
 msgstr "禁用硬件Beacon时钟"
@@ -766,7 +766,7 @@ msgid "Enable device"
 msgstr "开启设备"
 
 msgid "Enable learning and aging"
-msgstr ""
+msgstr "开启learning和aging"
 
 msgid "Enable this mount"
 msgstr "开启挂载mount"
@@ -1013,10 +1013,10 @@ msgid "IPv4 WAN Status"
 msgstr "IPv4 WAN状态"
 
 msgid "IPv4 and IPv6"
-msgstr ""
+msgstr "IPv4和IPv6"
 
 msgid "IPv4 only"
-msgstr ""
+msgstr "仅IPv4"
 
 msgid "IPv4-Address"
 msgstr "IPv4-地址"
@@ -1034,7 +1034,7 @@ msgid "IPv6 WAN Status"
 msgstr "IPv6 WAN状态"
 
 msgid "IPv6 only"
-msgstr ""
+msgstr "仅IPv6"
 
 msgid "Identity"
 msgstr "鉴权"
@@ -1191,7 +1191,7 @@ msgid "Lead Development"
 msgstr "开发向导"
 
 msgid "Lease validity time"
-msgstr ""
+msgstr "租用有效时间"
 
 msgid "Leasefile"
 msgstr "租约文件"
@@ -1416,7 +1416,7 @@ msgid "Multicast Rate"
 msgstr "组播速率"
 
 msgid "Multicast address"
-msgstr ""
+msgstr "组播地址"
 
 msgid "NAS ID"
 msgstr "NAS ID"
@@ -1704,7 +1704,7 @@ msgid "Protocol"
 msgstr "协议"
 
 msgid "Protocol family"
-msgstr ""
+msgstr "协议族"
 
 msgid "Provide new network"
 msgstr "添加新网络"

diff --git a/po/zh_CN/vnstat.po b/po/zh_CN/vnstat.po
index 45abbf4ffdb16b7aa80d82899900d2015d5b6055..bac76e101672aeceb6eaf30a12212407197be10a 100644 (file)
--- a/po/zh_CN/vnstat.po
+++ b/po/zh_CN/vnstat.po
@@ -1,62 +1,64 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2010-11-16 20:55+0100\n"
-"Last-Translator:  <xm@subsignal.org>\n"
+"PO-Revision-Date: 2011-06-11 14:16+0200\n"
+"Last-Translator: phantasm131 <phantasm131@gmail.com>\n"
 "Language-Team: German\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"
 
 msgid "Configuration"
-msgstr ""
+msgstr "配置"
 
 msgid "Daily traffic"
-msgstr ""
+msgstr "每日流量"
 
 msgid "Graphs"
-msgstr ""
+msgstr "图"
 
 msgid "Hourly traffic"
-msgstr ""
+msgstr "每小时流量"
 
 msgid "Monitor selected interfaces"
-msgstr ""
+msgstr "监视指定接口"
 
 msgid "Monthly traffic"
-msgstr ""
+msgstr "每月流量"
 
 msgid ""
 "No database has been set up yet. Go to the VnStat configuration and enable "
 "monitoring for one or more interfaces."
-msgstr ""
+msgstr "未建立数据库。请开启接口监视。"
 
 msgid "Restart VnStat"
-msgstr ""
+msgstr "重启VnStat"
 
 msgid "Summary display"
-msgstr ""
+msgstr "摘要显示"
 
 msgid "The VnStat service has been restarted."
-msgstr ""
+msgstr "VnStat服务已重启"
 
 msgid "Top 10 display"
-msgstr ""
+msgstr "显示最高10条"
 
 msgid "Update »"
-msgstr ""
+msgstr "刷新 》"
 
 msgid "VnStat"
-msgstr ""
+msgstr "VnStat"
 
 msgid "VnStat Graphs"
-msgstr ""
+msgstr "VnStat图"
 
 msgid "VnStat Traffic Monitor"
-msgstr ""
+msgstr "VnStat流量监控"
 
 msgid ""
 "VnStat is a network traffic monitor for Linux that keeps a log of network "
 "traffic for the selected interface(s)."
-msgstr ""
+msgstr "VnStat是一个网络流量监视工具，监视指定接口并作流量记录。"