7 files changed, 396 insertions, 250 deletions

diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index 68b087f93..5ab079925 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -37,12 +37,12 @@ msgstr "1分钟负载:"
 
 msgid "15 Minute Load:"
 msgstr "15分钟负载:"
-
+       
 msgid "40MHz 2nd channel above"
-msgstr "40MHz 2nd channel above"
+msgstr "40MHz高频组合"
 
 msgid "40MHz 2nd channel below"
-msgstr "40MHz 2nd channel below"
+msgstr "40MHz低频组合"
 
 msgid "5 Minute Load:"
 msgstr "5分钟负载:"
@@ -103,10 +103,10 @@ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-网关"
 
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"
-msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 配置"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>配置"
 
 msgid "<abbr title=\"Light Emitting Diode\">LED</abbr> Name"
-msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr> 名称"
+msgstr "<abbr title=\"Light Emitting Diode\">LED</abbr>名称"
 
 msgid ""
 "<abbr title=\"Lua Configuration Interface\">LuCI</abbr> is a collection of "
@@ -135,7 +135,7 @@ msgid ""
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
 "<abbr title=\"maximal\">最大</abbr> <abbr title=\"Dynamic Host Configuration "
-"Protocol\">DHCP</abbr>分配数目"
+"Protocol\">DHCP</abbr>分配数"
 
 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
@@ -145,11 +145,11 @@ msgstr ""
 "Domain Name System\">EDNS0</abbr>报文大小"
 
 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
-msgstr "<abbr title=\"maximal\">最大</abbr> 并发查询"
+msgstr "<abbr title=\"maximal\">最大</abbr>并发查询数"
 
 msgid ""
 "A lightweight HTTP/1.1 webserver written in C and Lua designed to serve LuCI"
-msgstr "一个用C语言和Lua实现的为LuCI提供服务的轻量级 HTTP/1.1 web服务器。"
+msgstr "一个用C语言和Lua实现的服务于LuCI的轻量级 HTTP/1.1 web服务器。"
 
 msgid ""
 "A small webserver which can be used to serve <abbr title=\"Lua Configuration "
@@ -159,22 +159,22 @@ msgstr ""
 "器。"
 
 msgid "AR Support"
-msgstr "AR 支持"
+msgstr "AR支持"
 
 msgid "ARP ping retries"
-msgstr "重试 ARP ping"
+msgstr "重试ARP ping"
 
 msgid "ATM Bridges"
-msgstr "ATM 桥接"
+msgstr "ATM桥接"
 
 msgid "ATM Settings"
-msgstr "ATM 设置"
+msgstr "ATM设置"
 
 msgid "ATM Virtual Channel Identifier (VCI)"
-msgstr "ATM 虚拟通道标识(VCI)"
+msgstr "ATM虚拟通道标识(VCI)"
 
 msgid "ATM Virtual Path Identifier (VPI)"
-msgstr "ATM 虚拟路径标识(VPI)"
+msgstr "ATM虚拟路径标识(VPI)"
 
 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
@@ -186,7 +186,7 @@ msgstr ""
 "to dial into the provider network."
 
 msgid "ATM device number"
-msgstr "ATM 设备号码"
+msgstr "ATM设备号码"
 
 msgid "About"
 msgstr "关于"
@@ -219,7 +219,7 @@ msgid "Active IP Connections"
 msgstr "活动IP连接"
 
 msgid "Active Leases"
-msgstr "活动的客户端"
+msgstr "活动客户端"
 
 msgid "Ad-Hoc"
 msgstr "点对点(Ad-Hoc)"
@@ -228,16 +228,16 @@ msgid "Add"
 msgstr "添加"
 
 msgid "Add local domain suffix to names served from hosts files"
-msgstr "添加本地域名后缀名称到主机文件"
+msgstr "添加本地域名后缀到主机文件"
 
 msgid "Add new interface..."
 msgstr "添加新接口..."
 
 msgid "Additional Hosts files"
-msgstr "其他主机文件"
+msgstr "附加主机文件"
 
 msgid "Additional pppd options"
-msgstr "更多pppd选项"
+msgstr "附加pppd选项"
 
 msgid "Address"
 msgstr "地址"
@@ -258,7 +258,7 @@ msgid "Advertise IPv6 on network"
 msgstr "在网络上通告IPv6"
 
 msgid "Advertised network ID"
-msgstr "通告网络ID"
+msgstr "通告的网络ID"
 
 msgid "Alert"
 msgstr "警报"
@@ -267,13 +267,13 @@ msgid "Alias"
 msgstr "别名"
 
 msgid "Allow <abbr title=\"Secure Shell\">SSH</abbr> password authentication"
-msgstr "允许 <abbr title=\"Secure Shell\">SSH</abbr> 密码验证"
+msgstr "允许<abbr title=\"Secure Shell\">SSH</abbr>密码验证"
 
 msgid "Allow all except listed"
-msgstr "允许列表外的"
+msgstr "仅允许列表外"
 
 msgid "Allow listed only"
-msgstr "仅允许列表内的"
+msgstr "仅允许列表内"
 
 msgid "Allow localhost"
 msgstr "允许本地主机"
@@ -289,13 +289,13 @@ msgstr "允许<em>root</em>用户凭密码登录"
 
 msgid ""
 "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services"
-msgstr "允许的上行响应范围：127.0.0.0/8，例如：RBL服务"
+msgstr "允许127.0.0.0/8回环范围内的上行响应，例如：RBL服务"
 
 msgid "Allowed range is 1 to FFFF"
 msgstr "允许范围：1 ~ FFFF"
 
 msgid "An additional network will be created if you leave this unchecked."
-msgstr "如果放弃选中那将创建一个额外的新网络"
+msgstr "放弃选中将会创建一个新网络"
 
 msgid "Antenna 1"
 msgstr "天线 1"
@@ -331,7 +331,7 @@ msgid "Available"
 msgstr "可用"
 
 msgid "Available packages"
-msgstr "可用的软件包"
+msgstr "可用软件包"
 
 msgid "Average:"
 msgstr "平均:"
@@ -358,7 +358,7 @@ msgid "Backup / Restore"
 msgstr "备份/恢复"
 
 msgid "Backup Archive"
-msgstr "已备份文档"
+msgstr "备份的存档"
 
 msgid "Bad address specified!"
 msgstr "指定了错误的地址！"
@@ -379,7 +379,7 @@ msgid "Bridge interfaces"
 msgstr "桥接接口"
 
 msgid "Bridge unit number"
-msgstr "桥接号码"
+msgstr "桥接号"
 
 msgid "Buffered"
 msgstr "已缓冲"
@@ -391,7 +391,7 @@ msgid "CPU"
 msgstr "CPU"
 
 msgid "CPU usage (%)"
-msgstr "CPU 使用率(%)"
+msgstr "CPU使用率(%)"
 
 msgid "Cached"
 msgstr "已缓存"
@@ -404,7 +404,7 @@ msgstr "链表"
 
 msgid ""
 "Change the password of the system administrator (User <code>root</code>)"
-msgstr "修改管理员密码 (<code>root</code>)"
+msgstr "修改管理员密码"
 
 msgid "Changes"
 msgstr "修改数"
@@ -430,16 +430,16 @@ msgid ""
 "fill out the <em>create</em> field to define a new zone and attach the "
 "interface to it."
 msgstr ""
-"选择指派到此接口的防火墙区域。选择<em>未指定</em>移除接口，或者<em>添加</em>"
-"新建防火墙区域。"
+"选择指派到此接口的防火墙区域。选中<em>未指定</em>移除已有绑定；或者填写<em>创建</em>栏以"
+"新建一个防火墙区域。"
 
 msgid ""
 "Choose the network you want to attach to this wireless interface. Select "
 "<em>unspecified</em> to not attach any network or fill out the <em>create</"
 "em> field to define a new network."
 msgstr ""
-"选择要连接到此无线接口的网络。选择<em>未指定</em>不连接到任何网络，或者<em>添"
-"加</em>来定义一个新网络。"
+"选择连接到此无线接口的网络。选中<em>未指定</em>不连接到任何网络；或者填写<em>创"
+"建</em>栏以新建一个网络。"
 
 msgid "Client"
 msgstr "客户端"
@@ -469,7 +469,7 @@ msgid "Configuration / Changes"
 msgstr "设置/更改"
 
 msgid "Configuration / Revert"
-msgstr "设置/恢复"
+msgstr "设置/放弃"
 
 msgid "Configuration applied."
 msgstr "设置已应用。"
@@ -480,10 +480,10 @@ msgstr "配置文件"
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
-msgstr "本地DNS服务器使用PPP对等连接提供的建议"
+msgstr "本地DNS服务器使用PPP端局提供的域名服务器"
 
 msgid "Configures this mount as overlay storage for block-extroot"
-msgstr "对于block-extroot则设置挂载为overlay存储 "
+msgstr "对于block-extroot则设置挂载到overlay存储 "
 
 msgid "Confirmation"
 msgstr "确认密码"
@@ -548,28 +548,28 @@ msgstr "自定义文件"
 msgid ""
 "Customizes the behaviour of the device <abbr title=\"Light Emitting Diode"
 "\">LED</abbr>s if possible."
-msgstr "自定义<abbr title=\"Light Emitting Diode\">LED</abbr>行为。"
+msgstr "自定义<abbr title=\"Light Emitting Diode\">LED</abbr>的活动状态。"
 
 msgid "DHCP Leases"
-msgstr "DHCP 分配"
+msgstr "DHCP分配"
 
 msgid "DHCP Server"
-msgstr "DHCP 服务器"
+msgstr "DHCP服务器"
 
 msgid "DHCP and DNS"
 msgstr "DHCP/DNS"
 
 msgid "DHCP assigned"
-msgstr "DHCP 有效分配"
+msgstr "DHCP有效分配"
 
 msgid "DHCP-Options"
-msgstr "DHCP-附加选项"
+msgstr "DHCP-选项"
 
 msgid "DNS"
 msgstr "DNS"
 
 msgid "DNS forwardings"
-msgstr "DNS 转发"
+msgstr "DNS转发"
 
 msgid "Debug"
 msgstr "调试"
@@ -588,7 +588,7 @@ msgid ""
 "\"<code>6,192.168.2.1,192.168.2.2</code>\" which advertises different DNS "
 "servers to clients."
 msgstr ""
-"定义DHCP的附加选项，例如设定\"<code>6,192.168.2.1,192.168.2.2</code>\"表示通"
+"设置DHCP的附加选项，例如设定\"<code>6,192.168.2.1,192.168.2.2</code>\"表示通"
 "告不同的DNS服务器给客户端。"
 
 msgid "Delete"
@@ -640,7 +640,7 @@ msgid "Disabled"
 msgstr "禁用"
 
 msgid "Discard upstream RFC1918 responses"
-msgstr "丢弃本地地址的上行(RFC1918)响应数据"
+msgstr "丢弃私有地址的上行(RFC1918)响应数据"
 
 msgid "Disconnect script"
 msgstr "断开脚本"
@@ -649,7 +649,7 @@ msgid "Distance Optimization"
 msgstr "距离优化"
 
 msgid "Distance to farthest network member in meters."
-msgstr "为远距离客户提供优化"
+msgstr "最远客户端的距离(单位:米)"
 
 msgid "Diversity"
 msgstr "分集"
@@ -674,13 +674,13 @@ msgid "Do not forward reverse lookups for local networks"
 msgstr "不查找本地网络"
 
 msgid "Do not send probe responses"
-msgstr "不发送探测回应"
+msgstr "不回送探测响应"
 
 msgid "Document root"
 msgstr "根文档"
 
 msgid "Domain required"
-msgstr "必需域名"
+msgstr "需要域名"
 
 msgid "Domain whitelist"
 msgstr "域名白名单"
@@ -703,7 +703,7 @@ msgid ""
 "and an integrated <abbr title=\"Secure Copy\">SCP</abbr> server"
 msgstr ""
 "Dropbear提供了集成的<abbr title=\"Secure Copy\">SCP</abbr>服务器和基于<abbr "
-"title=\"Secure Shell\">SSH</abbr>的shell访问。"
+"title=\"Secure Shell\">SSH</abbr>的shell访问"
 
 msgid "Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
 msgstr "动态<abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"
@@ -712,7 +712,7 @@ msgid ""
 "Dynamically allocate DHCP addresses for clients. If disabled, only clients "
 "having static leases will be served."
 msgstr ""
-"动态地分配DHCP地址给客户端。如果禁用，则只能为静态租用表中的客户端提供服务。"
+"动态地分配DHCP地址给客户端。如果禁用，则只能为静态租用表中的客户端提供网络服务。"
 
 msgid "EAP-Method"
 msgstr "EAP-Method"
@@ -736,7 +736,7 @@ msgid "Enable 4K VLANs"
 msgstr "开启 4K VLANs"
 
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
-msgstr "开启 <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
+msgstr "开启<abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
 msgid "Enable IPv6 on PPP link"
 msgstr "在PPP链路上启用IPv6"
@@ -745,7 +745,7 @@ msgid "Enable Jumbo Frame passthrough"
 msgstr "开启巨桢直通"
 
 msgid "Enable Keep-Alive"
-msgstr "开启保持活动 Keep-Alive"
+msgstr "开启保持活动"
 
 msgid "Enable TFTP server"
 msgstr "开启TFTP服务器"
@@ -769,7 +769,7 @@ msgid "Enable/Disable"
 msgstr "启用/禁用"
 
 msgid "Enabled"
-msgstr "已启用"
+msgstr "启用"
 
 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr "在此桥接上启用生成协议树"
@@ -800,7 +800,7 @@ msgstr "到期时间"
 
 msgid ""
 "Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
-msgstr "地址租约过期时间，最小为2分钟(<code>2m</code>)。"
+msgstr "地址租用过期时间，最小为2分钟(<code>2m</code>)。"
 
 msgid "External system log server"
 msgstr "外部系统日志服务器"
@@ -815,7 +815,7 @@ msgid "File"
 msgstr "文件"
 
 msgid "Filename of the boot image advertised to clients"
-msgstr "向客户端通告启动镜像文件名"
+msgstr "向客户端通告的启动镜像文件名"
 
 msgid "Files to be kept when flashing a new firmware"
 msgstr "更新固件时被保存的文件"
@@ -869,10 +869,10 @@ msgid "Force"
 msgstr "强制"
 
 msgid "Force DHCP on this network even if another server is detected."
-msgstr "在探测到有其他DHCP服务器的情况下也强制启动DHCP。"
+msgstr "在本网络探测到有其他DHCP服务器的情况下也强制启动DHCP。"
 
 msgid "Forward DHCP"
-msgstr "转发 DHCP"
+msgstr "转发DHCP"
 
 msgid "Forward broadcasts"
 msgstr "转发广播"
@@ -920,10 +920,10 @@ msgid "HE.net Tunnel ID"
 msgstr "HE.net隧道ID"
 
 msgid "HT capabilities"
-msgstr "HT 功能"
+msgstr "HT功能"
 
 msgid "HT mode"
-msgstr "HT 模式"
+msgstr "HT模式"
 
 msgid "Handler"
 msgstr "处理程序"
@@ -995,10 +995,10 @@ msgid "IPv4"
 msgstr "IPv4"
 
 msgid "IPv4 Firewall"
-msgstr "IPv4 防火墙"
+msgstr "IPv4防火墙"
 
 msgid "IPv4 WAN Status"
-msgstr "IPv4 WAN 状态"
+msgstr "IPv4 WAN状态"
 
 msgid "IPv4-Address"
 msgstr "IPv4-地址"
@@ -1007,25 +1007,25 @@ msgid "IPv6"
 msgstr "IPv6"
 
 msgid "IPv6 Firewall"
-msgstr "IPv6 防火墙"
+msgstr "IPv6防火墙"
 
 msgid "IPv6 Setup"
 msgstr "IPv6设置"
 
 msgid "IPv6 WAN Status"
-msgstr "IPv6 WAN 状态"
+msgstr "IPv6 WAN状态"
 
 msgid "Identity"
 msgstr "鉴权"
 
 msgid ""
 "If specified, mount the device by its UUID instead of a fixed device node"
-msgstr "如果设备指定了UUID，则用其取代既定的设备节点来挂载设备"
+msgstr "如果设备指定了UUID，则用其来挂载设备"
 
 msgid ""
 "If specified, mount the device by the partition label instead of a fixed "
 "device node"
-msgstr "如果设备指定了卷标，则用其取代既定的设备节点来挂载设备"
+msgstr "如果设备指定了卷标，则用其来挂载设备"
 
 msgid ""
 "If your physical memory is insufficient unused data can be temporarily "
@@ -1034,15 +1034,15 @@ msgid ""
 "slow process as the swap-device cannot be accessed with the high datarates "
 "of the <abbr title=\"Random Access Memory\">RAM</abbr>."
 msgstr ""
-"如果物理内存不足，暂时不用的数据可以交换到swap设备暂存，从而得到更多的可用内"
-"存。应了解的是，访问swap设备比访问<abbr title=\"Random Access Memory\">RAM</"
-"abbr>要慢不少。"
+"如果物理内存不足，暂时不用的数据可以交换到swap设备暂存，以得到更多的可用内"
+"存。不过访问swap设备比访问<abbr title=\"Random Access Memory\">RAM</"
+"abbr>的速度慢。"
 
 msgid "Ignore Hosts files"
 msgstr "忽略主机文件"
 
 msgid "Ignore interface"
-msgstr "关闭 DHCP"
+msgstr "关闭DHCP"
 
 msgid "Ignore resolve file"
 msgstr "忽略解析文件"
@@ -1116,7 +1116,7 @@ msgid ""
 msgstr "试图刷写一个会变砖的固件，路由器鸭梨很大，请验证！"
 
 msgid "Java Script required!"
-msgstr "需要 Java Script！"
+msgstr "需要Java Script！"
 
 msgid "Join Network"
 msgstr "加入网络"
@@ -1134,7 +1134,7 @@ msgid "Keep configuration files"
 msgstr "保留配置"
 
 msgid "Keep-Alive"
-msgstr "保持活动Keep-Alive"
+msgstr "保持活动"
 
 msgid "Kernel"
 msgstr "内核"
@@ -1158,7 +1158,7 @@ msgid "LLC"
 msgstr "逻辑链路控制LLC"
 
 msgid "Label"
-msgstr "标签"
+msgstr "卷标"
 
 msgid "Language"
 msgstr "语言"
@@ -1193,13 +1193,13 @@ msgid "Let pppd run this script before tearing down the PPP link"
 msgstr "PPP连接断开前运行此脚本"
 
 msgid "Limit"
-msgstr "最大"
+msgstr "限制"
 
 msgid "Link"
 msgstr "链接"
 
 msgid "Link On"
-msgstr "已链接"
+msgstr "活动链接"
 
 msgid ""
 "List of <abbr title=\"Domain Name System\">DNS</abbr> servers to forward "
@@ -1210,7 +1210,7 @@ msgid "List of domains to allow RFC1918 responses for"
 msgstr "允许RFC1918响应的域名表"
 
 msgid "Listen only on the given interface or, if unspecified, on all"
-msgstr "只监听给定的接口，若未指定则监听全部"
+msgstr "监听指定的接口；若未指定则监听全部"
 
 msgid "Listening port for inbound DNS queries"
 msgstr "入站DNS查询的监听端口"
@@ -1247,10 +1247,10 @@ msgstr "本地服务器"
 msgid ""
 "Localise hostname depending on the requesting subnet if multiple IPs are "
 "available"
-msgstr "如果多个IP可用，则依赖于请求子网来定位主机名"
+msgstr "如果多个IP可用，则依赖于请求子网来本地化主机名"
 
 msgid "Localise queries"
-msgstr "定位查询"
+msgstr "本地化查询"
 
 msgid "Log output level"
 msgstr "日志记录等级"
@@ -1268,7 +1268,7 @@ msgid "Logout"
 msgstr "退出"
 
 msgid "Lowest leased address as offset from the network address."
-msgstr "分配IP的最小值"
+msgstr "网络地址的起始分配基址"
 
 msgid "MAC"
 msgstr "硬件地址"
@@ -1283,7 +1283,7 @@ msgid "MAC-Address Filter"
 msgstr "MAC-地址过滤"
 
 msgid "MAC-Filter"
-msgstr "MAC-过滤器"
+msgstr "MAC-过滤"
 
 msgid "MAC-List"
 msgstr "MAC-列表"
@@ -1306,7 +1306,7 @@ msgid "Maximum Rate"
 msgstr "最高速率"
 
 msgid "Maximum allowed number of active DHCP leases"
-msgstr "允许的最大活跃DHCP租约数"
+msgstr "允许的最大活跃DHCP租用数"
 
 msgid "Maximum allowed number of concurrent DNS queries"
 msgstr "允许的最大并发DNS查询数"
@@ -1315,10 +1315,10 @@ msgid "Maximum allowed size of EDNS.0 UDP packets"
 msgstr "允许的最大EDNS.0 UDP报文大小"
 
 msgid "Maximum hold time"
-msgstr "最大有效时间"
+msgstr "最大持续时间"
 
 msgid "Maximum number of leased addresses."
-msgstr "最大租约地址数量"
+msgstr "最大地址分配数量"
 
 msgid "Memory"
 msgstr "内存"
@@ -1333,13 +1333,13 @@ msgid "Minimum Rate"
 msgstr "最低速率"
 
 msgid "Minimum hold time"
-msgstr "最低有效时间"
+msgstr "最低保持时间"
 
 msgid "Mode"
 msgstr "模式"
 
 msgid "Modem device"
-msgstr "Modem 设备"
+msgstr "Modem设备"
 
 msgid "Monitor"
 msgstr "监听"
@@ -1466,13 +1466,13 @@ msgstr "未设置"
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
-msgstr "注意:如果此处选择的接口是另一个网络的一部分，那将会迁入此网络。"
+msgstr "注意：如果此处选择的接口是另一个网络的一部分，那将会迁入此网络。"
 
 msgid "Notice"
 msgstr "注意"
 
 msgid "Number of failed connection tests to initiate automatic reconnect"
-msgstr "用于启动自动重新连接的失败连接尝试数目"
+msgstr "启动自动重连的失败连接次数"
 
 msgid "OK"
 msgstr "OK"
@@ -1494,8 +1494,8 @@ msgid ""
 "<samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: "
 "<samp>eth0.1</samp>)."
 msgstr ""
-"本页可配置网络接口。选中\"桥接接口\"可把几个接口组合配置成网桥，\"接口\"加入"
-"的多个接口须用空格隔开，也可用INTERFACE.VLANNR来标记 <abbr title=\"Virtual "
+"本页可配置网络接口。选中\"桥接接口\"可把几个接口组合配置成网桥，自定义添加"
+"的多个接口名须用空格隔开，也可用INTERFACE.VLANNR来标记 <abbr title=\"Virtual "
 "Local Area Network\">VLAN</abbr> 。(<abbr title=\"for example\">例如</abbr>: "
 "<samp>eth0.1</samp>)"
 
@@ -1512,13 +1512,13 @@ msgid "Open"
 msgstr "开启"
 
 msgid "Option changed"
-msgstr "修改的设置"
+msgstr "修改的选项"
 
 msgid "Option removed"
-msgstr "放弃的设置"
+msgstr "移除的选项"
 
 msgid "Options"
-msgstr "设置"
+msgstr "选项"
 
 msgid "Other:"
 msgstr "其余:"
@@ -1538,7 +1538,7 @@ msgstr "更新网关"
 msgid ""
 "Override the netmask sent to clients. Normally it is calculated from the "
 "subnet that is served."
-msgstr "更新发送给客户端的子网掩码。这通常由子网计算得出。"
+msgstr "更新发送给客户端的子网掩码。这通常由子网算出。"
 
 msgid "Overview"
 msgstr "总览"
@@ -1550,10 +1550,10 @@ msgid "PID"
 msgstr "PID"
 
 msgid "PIN code"
-msgstr "PIN 码"
+msgstr "PIN码"
 
 msgid "PPP Settings"
-msgstr "PPP 设置"
+msgstr "PPP设置"
 
 msgid "PPPoA Encapsulation"
 msgstr "PPPoA封包"
@@ -1562,10 +1562,10 @@ msgid "Package libiwinfo required!"
 msgstr "需要libiwinfo软件包！"
 
 msgid "Package lists"
-msgstr "软件包列表"
+msgstr "软件同步源"
 
 msgid "Package lists updated"
-msgstr "已更新的软件包列表"
+msgstr "更新软件包列表"
 
 msgid "Package name"
 msgstr "软件包名称"
@@ -1607,7 +1607,7 @@ msgid "Physical Settings"
 msgstr "物理设置"
 
 msgid "Pkts."
-msgstr "报文数"
+msgstr "数据包"
 
 msgid "Please enter your username and password."
 msgstr "请输入用户名和密码。"
@@ -1638,13 +1638,13 @@ msgstr ""
 "桢的默认VLAN ID。"
 
 msgid "Port PVIDs on %q"
-msgstr "端口的PVID %q"
+msgstr "端口的PVID是 %q"
 
 msgid "Ports"
 msgstr "端口"
 
 msgid "Post-commit actions"
-msgstr "Post-commit 操作"
+msgstr "Post-commit操作"
 
 msgid "Power"
 msgstr "Power"
@@ -1659,7 +1659,7 @@ msgid "Proceed"
 msgstr "执行"
 
 msgid "Proceed reverting all settings and resetting to firmware defaults?"
-msgstr "放弃所有配置并将路由恢复出厂设置？"
+msgstr "放弃所有配置并将路由复位到默认状态？"
 
 msgid "Processes"
 msgstr "进程"
@@ -1680,13 +1680,13 @@ msgid "Provide new network"
 msgstr "添加新网络"
 
 msgid "Pseudo Ad-Hoc"
-msgstr "伪装 Ad-Hoc"
+msgstr "伪装Ad-Hoc"
 
 msgid "Pseudo Ad-Hoc (ahdemo)"
-msgstr "伪装 Ad-Hoc (ahdemo)"
+msgstr "伪装Ad-Hoc(ahdemo)"
 
 msgid "RTS/CTS Threshold"
-msgstr "RTS/CTS 阈值"
+msgstr "RTS/CTS阈值"
 
 msgid "RX"
 msgstr "接收"
@@ -1702,24 +1702,24 @@ msgid ""
 "Configuration Protocol\">DHCP</abbr>-Server"
 msgstr ""
 "根据<code>/etc/ethers</code>来配置<abbr title=\"Dynamic Host Configuration "
-"Protocol\">DHCP</abbr>服务器"
+"Protocol\">DHCP</abbr>-服务器"
 
 msgid ""
 "Really delete this interface? The deletion cannot be undone!\n"
 "You might loose access to this router if you are connected via this "
 "interface."
-msgstr "真的要删除此接口？如果正使用此接口管理路由，可能导致无法再管理路由器！"
+msgstr "真的要删除此接口？如果正由此接口管理路由，可能导致无法再管理路由器！"
 
 msgid ""
 "Really delete this wireless network? The deletion cannot be undone!\n"
 "You might loose access to this router if you are connected via this network."
-msgstr "真的要删除此网络？如果正使用此网络管理路由，可能导致无法再管理路由器！"
+msgstr "真的要删除此网络？如果正由此网络管理路由，可能导致无法再管理路由器！"
 
 msgid ""
 "Really shutdown interface \"%s\" ?\n"
 "You might loose access to this router if you are connected via this "
 "interface."
-msgstr "真的要关闭此接口？如果正使用此接口管理路由，可能导致无法再管理路由器！"
+msgstr "真的要关闭此接口？如果正由此接口管理路由，可能导致无法再管理路由器！"
 
 msgid "Realtime Connections"
 msgstr "实时连接"
@@ -1767,7 +1767,7 @@ msgid "Remove"
 msgstr "移除"
 
 msgid "Repeat scan"
-msgstr "重复扫描"
+msgstr "重新扫描"
 
 msgid "Replace default route"
 msgstr "重置默认路由"
@@ -1835,10 +1835,10 @@ msgid ""
 msgstr "路由表描述了数据包的可达路径。"
 
 msgid "Routing table ID"
-msgstr "路由表 ID"
+msgstr "路由表ID"
 
 msgid "Rule #"
-msgstr "规则 #"
+msgstr "规则#"
 
 msgid "Run a filesystem check before mounting the device"
 msgstr "挂载设备前运行文件系统检查"
@@ -1878,13 +1878,13 @@ msgid ""
 msgstr "Modem尝试连接的就绪准备时间"
 
 msgid "Section added"
-msgstr "已添加区域"
+msgstr "添加的区域"
 
 msgid "Section removed"
-msgstr "已移除区域"
+msgstr "移除的区域"
 
 msgid "See \"mount\" manpage for details"
-msgstr "详细参见\"mount\"联机帮助"
+msgstr "详参\"mount\"联机帮助"
 
 msgid "Send Router Solicitiations"
 msgstr "发送路由探测"
@@ -1893,7 +1893,7 @@ msgid "Separate Clients"
 msgstr "隔离客户端"
 
 msgid "Separate WDS"
-msgstr "隔离 WDS"
+msgstr "隔离WDS"
 
 msgid "Server IPv4-Address"
 msgstr "服务器IPv4-地址"
@@ -1926,7 +1926,7 @@ msgid "Size"
 msgstr "大小"
 
 msgid "Skip"
-msgstr "忽略"
+msgstr "跳过"
 
 msgid "Skip to content"
 msgstr "跳到内容"
@@ -1958,13 +1958,13 @@ msgid "Specifies the button state to handle"
 msgstr "指定要处理的按键状态"
 
 msgid "Specifies the directory the device is attached to"
-msgstr "指定设备的连接目录"
+msgstr "指定设备的挂载目录"
 
 msgid "Specifies the listening port of this <em>Dropbear</em> instance"
 msgstr "指定此<em>Dropbear</em>实例的监听端口"
 
 msgid "Specify additional command line arguments for pppd here"
-msgstr "指定其他命令行参数到pppd"
+msgstr "指定附加命令行参数到pppd"
 
 msgid "Specify the secret encryption key here."
 msgstr "指定安全加密"
@@ -1976,7 +1976,7 @@ msgid "Start priority"
 msgstr "启动优先级"
 
 msgid "Startup"
-msgstr "启动"
+msgstr "启动项"
 
 msgid "Static IPv4 Routes"
 msgstr "静态IPv4路由"
@@ -1991,15 +1991,15 @@ msgid "Static Routes"
 msgstr "静态路由"
 
 msgid "Static WDS"
-msgstr "静态 WDS"
+msgstr "静态WDS"
 
 msgid ""
 "Static leases are used to assign fixed IP addresses and symbolic hostnames "
 "to DHCP clients. They are also required for non-dynamic interface "
 "configurations where only hosts with a corresponding lease are served."
 msgstr ""
-"静态租约被用于分配给DHCP客户端以固定的IP地址和主机标识。并且要求接口为非动态"
-"配置，只有合法主机才能连接。"
+"静态租约用于给客户端分配固定的IP地址和主机标识。只有合法主机才能连接，"
+"并且接口须为非动态配置。"
 
 msgid "Status"
 msgstr "状态"
@@ -2050,7 +2050,7 @@ msgid "TX"
 msgstr "发送"
 
 msgid "Table"
-msgstr "列表"
+msgstr "表格"
 
 msgid "Target"
 msgstr "对象"
@@ -2068,7 +2068,7 @@ msgid ""
 "SSID capable). Per network settings like encryption or operation mode are "
 "grouped in the <em>Interface Configuration</em>."
 msgstr ""
-"<em>设备配置</em>项会更新无线的物理硬件设置，比如信道，发射功率，或发射天线。"
+"<em>设备配置</em>区域会更新无线的物理硬件设置，比如信道，发射功率，或发射天线。"
 
 msgid ""
 "The <em>libiwinfo</em> package is not installed. You must install this "
@@ -2086,7 +2086,7 @@ msgid ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
-"存储器或分区的设备文件 (<abbr title=\"for example\">例如</abbr> <code>/dev/"
+"存储器或分区的设备文件，(<abbr title=\"for example\">例如</abbr> <code>/dev/"
 "sda1</code>)"
 
 msgid "The device node of your modem, e.g. /dev/ttyUSB0"
@@ -2097,7 +2097,7 @@ msgid ""
 "\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
 "samp>)"
 msgstr ""
-"用于格式化存储器的文件系统 (<abbr title=\"for example\">例如</abbr> "
+"用于格式化存储器的文件系统，(<abbr title=\"for example\">例如</abbr> "
 "<samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)"
 
 msgid ""
@@ -2105,7 +2105,7 @@ msgid ""
 "compare them with the original file to ensure data integrity.<br /> Click "
 "\"Proceed\" below to start the flash procedure."
 msgstr ""
-"固件已上传，请注意核对文件大小和校验值！<br /> 点击 \"执行\" 开始刷写固件，刷"
+"固件已上传，请注意核对文件大小和校验值！<br />点击 \"执行\" 开始刷写固件，刷"
 "新过程请勿断电！"
 
 msgid "The following changes have been committed"
@@ -2135,7 +2135,7 @@ msgid ""
 "segments. Often there is by default one Uplink port for a connection to the "
 "next greater network like the internet and other ports for a local network."
 msgstr ""
-"该设备可以划分为多个<abbr title=\"Virtual Local Area Network\">VLAN</abbr>，"
+"本设备可以划分为多个<abbr title=\"Virtual Local Area Network\">VLAN</abbr>，"
 "并支持电脑间的直接通讯；<abbr title=\"Virtual Local Area Network\">VLAN</"
 "abbr>也常用于分割不同网段；默认通常是一条上传端口连接ISP，其余端口为本地子"
 "网。"
@@ -2151,7 +2151,7 @@ msgid ""
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
-"正在刷新系统...<br /> 切勿关闭电源!<br /> 稍等数分钟即可重新连接到路由，可能"
+"正在刷新系统...<br />切勿关闭电源!<br />稍等数分钟即可重新连接到路由，可能"
 "需要更改计算机的IP地址以重新连接。"
 
 msgid ""
@@ -2193,7 +2193,7 @@ 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'之前)，就可以"
+"这里显示了/etc/rc.local的内容。将自定义的命令插入到这里('exit 0'之前)，即可"
 "在系统启动完成后执行这些命令。"
 
 msgid ""
@@ -2204,7 +2204,7 @@ msgstr ""
 "abbr>服务器"
 
 msgid "This is the system crontab in which scheduled tasks can be defined."
-msgstr "这里可以指定系统crontab中的计划任务。"
+msgstr "这里可以自定义系统crontab中的计划任务。"
 
 msgid ""
 "This list gives an overview over currently running system processes and "
@@ -2212,7 +2212,7 @@ msgid ""
 msgstr "这里显示了当前系统中正在运行的进程和其状态信息。"
 
 msgid "This page allows the configuration of custom button actions"
-msgstr "本页可自定义按键行为。"
+msgstr "本页可自定义按键动作。"
 
 msgid "This page gives an overview over currently active network connections."
 msgstr "本页显示了活跃的网络连接概况。"
@@ -2257,10 +2257,10 @@ msgid "Trigger Mode"
 msgstr "触发模式"
 
 msgid "Tunnel Settings"
-msgstr "信道设置"
+msgstr "隧道设置"
 
 msgid "Turbo Mode"
-msgstr "Turbo 模式"
+msgstr "Turbo模式"
 
 msgid "Tx-Power"
 msgstr "传输功率"
@@ -2311,7 +2311,7 @@ msgid "Use ISO/IEC 3166 alpha2 country codes."
 msgstr "使用ISO/IEC 3166 alpha2国家代码"
 
 msgid "Use as root filesystem"
-msgstr "作为根文件系统"
+msgstr "挂载到根文件系统"
 
 msgid "Use peer DNS"
 msgstr "使用对等DNS"
@@ -2324,10 +2324,10 @@ msgid ""
 msgstr "使用<em>添加</em>按键来增加新的租约条目。"
 
 msgid "Used"
-msgstr "已使用"
+msgstr "已用"
 
 msgid "Used Key Slot"
-msgstr "已使用的键槽"
+msgstr "启用密码组"
 
 msgid "Username"
 msgstr "用户名"
@@ -2351,19 +2351,19 @@ msgid "WDS"
 msgstr "WDS"
 
 msgid "WEP Open System"
-msgstr "WEP 开放认证"
+msgstr "WEP开放认证"
 
 msgid "WEP Shared Key"
-msgstr "WEP 共享密钥"
+msgstr "WEP共享密钥"
 
 msgid "WEP passphrase"
-msgstr "WEP 密钥"
+msgstr "WEP密钥"
 
 msgid "WMM Mode"
-msgstr "WMM 模式"
+msgstr "WMM模式"
 
 msgid "WPA passphrase"
-msgstr "WPA 密钥"
+msgstr "WPA密钥"
 
 msgid ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
@@ -2405,20 +2405,20 @@ msgid "Wireless Security"
 msgstr "无线安全"
 
 msgid "Wireless is disabled or not associated"
-msgstr "未开启无线或未关联无线"
+msgstr "未开启或未关联无线"
 
 msgid "Write received DNS requests to syslog"
 msgstr "将DNS请求写入系统日志"
 
 msgid "XR Support"
-msgstr "XR 支持"
+msgstr "XR支持"
 
 msgid ""
 "You can enable or disable installed init scripts here. Changes will applied "
 "after a device reboot.<br /><strong>Warning: If you disable essential init "
 "scripts like \"network\", your device might become inaccesable!</strong>"
 msgstr ""
-"此处可以启用或禁用安装的启动脚本。更改在设备重启后生效。<br /><strong>警告: "
+"此处可以启用或禁用已安装的启动脚本。更改在设备重启后生效。<br /><strong>警告: "
 "如果禁用了必要的启动脚本 (比如: \"network\") ，可能会导致设备无法访问！</"
 "strong>"
 
@@ -2435,8 +2435,8 @@ msgid ""
 "You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, "
 "\"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support"
 msgstr ""
-"需要安装\"comgt\" 以支持 UMTS/GPRS, \"ppp-mod-pppoe\" 以支持 PPPoE, \"ppp-"
-"mod-pppoa\" 以支持 PPPoA \"pptp\" 以支持 PPtP。"
+"需安装\"comgt\"以支持UMTS/GPRS,\"ppp-mod-pppoe\"以支持PPPoE,\"ppp-"
+"mod-pppoa\"以支持PPPoA,\"pptp\"以支持PPtP。"
 
 msgid "any"
 msgstr "任意"
@@ -2502,7 +2502,7 @@ msgid "static"
 msgstr "静态IP"
 
 msgid "tagged"
-msgstr "标签"
+msgstr "已标记"
 
 msgid "unlimited"
 msgstr "无限制"
@@ -2511,10 +2511,10 @@ msgid "unspecified"
 msgstr "未指定"
 
 msgid "unspecified -or- create:"
-msgstr "未指定或创建:"
+msgstr "未指定  //  创建:"
 
 msgid "untagged"
-msgstr "无标签"
+msgstr "未标记"
 
 msgid "yes"
 msgstr "是"
@@ -2767,7 +2767,7 @@ msgstr "« 后退"
 #~ msgstr "本地网络"
 
 #~ msgid "Number of leased addresses"
-#~ msgstr "地址租约数"
+#~ msgstr "地址租用数"
 
 #~ msgid "Path"
 #~ msgstr "路径"
diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index e65d86483..3b31761b0 100644
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2011-04-29 08:30-0800\n"
-"Last-Translator: gzanan <axishero@foxmail.com>\n"
+"PO-Revision-Date: 2011-05-16 18:13+0700\n"
+"Last-Translator: Our Teammates\n"
 "Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,19 +26,14 @@ msgstr "高级规则"
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-msgid ""
-"Advanced rules let you customize the firewall to your needs. Only new "
-"connections will be matched. Packets belonging to already open connections "
-"are automatically allowed to pass the firewall."
-msgstr ""
-"高级规则可以让你自己按照自己的需要来管理防火墙。此规则只限制新建立的连接，对"
-"于原来的连接会自动设为允许。"
+msgid "Advanced rules let you customize the firewall to your needs. Only new connections will be matched. Packets belonging to already open connections are automatically allowed to pass the firewall."
+msgstr "高级规则可以让你自己按照自己的需要来管理防火墙。此规则只限制新建立的连接，对于原来的连接会自动设为允许。"
 
 msgid "Allow forward from <em>source zones</em>:"
-msgstr "同意来自<em>source zones</em>"
+msgstr "允许从<em>source zones</em>转发"
 
 msgid "Allow forward to <em>destination zones</em>:"
-msgstr "同意发送到<em>source zones</em>"
+msgstr "允许转发到<em>source zones</em>"
 
 msgid "Any"
 msgstr "任何"
@@ -71,19 +66,19 @@ msgid "Drop invalid packets"
 msgstr "丢弃无效数据包"
 
 msgid "Enable NAT Loopback"
-msgstr "启用NAT循环"
+msgstr "启用NAT环回"
 
 msgid "Enable SYN-flood protection"
-msgstr "启用SYN-flood 保护"
+msgstr "启用SYN-flood防御"
 
 msgid "Enable logging on this zone"
 msgstr "在此区域允许进入"
 
 msgid "External port"
-msgstr "扩展口"
+msgstr "外部端口"
 
 msgid "Family"
-msgstr "族"
+msgstr "地址集合"
 
 msgid "Firewall"
 msgstr "防火墙"
@@ -91,11 +86,8 @@ msgstr "防火墙"
 msgid "Firewall - Zone Settings"
 msgstr "防火墙-区域设置"
 
-msgid ""
-"For DNAT, match incoming traffic directed at the given destination ip "
-"address. For SNAT rewrite the source address to the given address."
-msgstr ""
-"DNAT，用于检查输入通道指向指定的目标IP地址，SNAT，用指定的地址覆盖源地址"
+msgid "For DNAT, match incoming traffic directed at the given destination ip address. For SNAT rewrite the source address to the given address."
+msgstr "DNAT：将目标地址转换为指定的IP地址；SNAT：将源地址转换为指定的IP地址。"
 
 msgid "Force connection tracking"
 msgstr "强制连接追踪"
@@ -110,19 +102,19 @@ msgid "IPv4 and IPv6"
 msgstr "IPv4 和 IPv6"
 
 msgid "IPv4 only"
-msgstr "IPv4"
+msgstr "仅IPv4"
 
 msgid "IPv6 only"
-msgstr "IPv6 "
+msgstr "仅IPv6 "
 
 msgid "Input"
-msgstr "入"
+msgstr "入（路由器）"
 
 msgid "Intended destination address"
 msgstr "目标地址"
 
 msgid "Inter-Zone Forwarding"
-msgstr "区域内转发"
+msgstr "端口触发"
 
 msgid "Internal IP address"
 msgstr "内部IP地址"
@@ -137,29 +129,25 @@ msgid "Limit log messages"
 msgstr "限制登陆信息"
 
 msgid "MSS clamping"
-msgstr "MSS clamping"
+msgstr "MSS钳制"
 
 msgid "Masquerading"
-msgstr "加密"
+msgstr "IP动态伪装"
 
 msgid "Match ICMP type"
 msgstr "匹配ICMP类型"
 
-msgid ""
-"Match incoming traffic directed at the given destination port or port range "
-"on this host"
+msgid "Match incoming traffic directed at the given destination port or port range on this host"
 msgstr "在这个主机上，匹配输入的信息指向给定的端口或者范围"
 
-msgid ""
-"Match incoming traffic originating from the given source port or port range "
-"on the client host"
+msgid "Match incoming traffic originating from the given source port or port range on the client host"
 msgstr "在客户端上，比较输入通道与给定的源端口是否一致。"
 
 msgid "Name"
 msgstr "名字"
 
 msgid "Output"
-msgstr "出"
+msgstr "出（路由器）"
 
 msgid "Overview"
 msgstr "概览"
@@ -167,20 +155,17 @@ msgstr "概览"
 msgid "Port forwarding"
 msgstr "端口转发"
 
-msgid ""
-"Port forwarding allows to provide network services in the internal network "
-"to an external network."
-msgstr "端口转发-允许内部网络访问外部网络"
+msgid "Port forwarding allows to provide network services in the internal network to an external network."
+msgstr "端口转发-允许外部网络访问内部网络"
 
 msgid "Protocol"
 msgstr "协议"
 
-msgid ""
-"Redirect matched incoming traffic to the given port on the internal host"
-msgstr "在内部网络上，检查输入通道与给定的源端口是否一致。"
+msgid "Redirect matched incoming traffic to the given port on the internal host"
+msgstr "重定向匹配到的入站流量至内部主机的指定端口"
 
 msgid "Redirect matched incoming traffic to the specified internal host"
-msgstr "检查输入通道与特定的内部主机是否一致。"
+msgstr "重定向匹配到的入站流量至选定的内部主机"
 
 msgid "Redirection type"
 msgstr "重定向类型"
@@ -189,10 +174,10 @@ msgid "Redirections"
 msgstr "重定向"
 
 msgid "Restrict Masquerading to given destination subnets"
-msgstr "限制访问指定的目标子网络"
+msgstr "限制访问指定的目标子网"
 
 msgid "Restrict Masquerading to given source subnets"
-msgstr "限制访问指定的子网络"
+msgstr "限制访问指定的源子网"
 
 msgid "Restrict to address family"
 msgstr "限制地址"
@@ -248,43 +233,26 @@ msgstr "源端口"
 msgid "Source zone"
 msgstr "源区域"
 
-msgid ""
-"The firewall creates zones over your network interfaces to control network "
-"traffic flow."
-msgstr "防火墙可以把你的网络接口分为不同的区域进行管理 "
+msgid "The firewall creates zones over your network interfaces to control network traffic flow."
+msgstr "防火墙把网络接口分为不同的区域进行管理 "
 
-msgid ""
-"The options below control the forwarding policies between this zone (%s) and "
-"other zones. <em>Destination zones</em> cover forwarded traffic "
-"<strong>originating from %q</strong>. <em>Source zones</em> match forwarded "
-"traffic from other zones <strong>targeted at %q</strong>. The forwarding "
-"rule is <em>unidirectional</em>, e.g. a forward from lan to wan does "
-"<em>not</em> imply a permission to forward from wan to lan as well."
+msgid "The options below control the forwarding policies between this zone (%s) and other zones. <em>Destination zones</em> cover forwarded traffic <strong>originating from %q</strong>. <em>Source zones</em> match forwarded traffic from other zones <strong>targeted at %q</strong>. The forwarding rule is <em>unidirectional</em>, e.g. a forward from lan to wan does <em>not</em> imply a permission to forward from wan to lan as well."
 msgstr "这个属性用来控制区域对区域的转发规则。"
 
-msgid ""
-"This section defines common properties of %q. The <em>input</em> and "
-"<em>output</em> options set the default policies for traffic entering and "
-"leaving this zone while the <em>forward</em> option describes the policy for "
-"forwarded traffic between different networks within the zone. <em>Covered "
-"networks</em> specifies which available networks are member of this zone."
-msgstr ""
-"本节定义 %q 的通用属性， <em>input</em> 和 <em>output</em>的属性使用这个区域"
-"默认的转发原则。<em>Covered networks</em>是这个区域的特殊规则。"
+msgid "This section defines common properties of %q. The <em>input</em> and <em>output</em> options set the default policies for traffic entering and leaving this zone while the <em>forward</em> option describes the policy for forwarded traffic between different networks within the zone. <em>Covered networks</em> specifies which available networks are member of this zone."
+msgstr "本节定义 %q 的通用属性， <em>input</em> 和 <em>output</em>规则用于设置数据包“进”和“出”路由器（某个接口）默认的转发原则，<em>forward</em>规则用于特定（一个或多个）区域的不同子网之间的数据包转发而<em>Covered networks</em>是从属于这个区域的一个网络地址集合。"
 
 msgid "Traffic Redirection"
 msgstr "流量重定向"
 
-msgid ""
-"Traffic redirection allows you to change the destination address of "
-"forwarded packets."
+msgid "Traffic redirection allows you to change the destination address of forwarded packets."
 msgstr "流量重定向允许你修改数据包转发地址"
 
 msgid "Via"
 msgstr "通过"
 
 msgid "Zone %q"
-msgstr "区域%q"
+msgstr "区域 %q"
 
 msgid "Zone ⇒ Forwardings"
 msgstr "区域 ⇒ 转发"
diff --git a/po/zh_CN/hd_idle.po b/po/zh_CN/hd_idle.po
index 0cbeca8dd..6bbbae076 100644
--- a/po/zh_CN/hd_idle.po
+++ b/po/zh_CN/hd_idle.po
@@ -3,26 +3,22 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-14 10:33+0200\n"
-"PO-Revision-Date: 2011-05-05 18:04-0800\n"
-"Last-Translator: gzanan <axishero@foxmail.com>\n"
-"Language-Team: QQ Group:75543259\n"
+"PO-Revision-Date: 2011-05-16 19:09+0700\n"
+"Last-Translator: Our Teammates\n"
+"Language-Team: QQ Group:75543259 <axishero@foxmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0\n"
 
-msgid ""
-"hd-idle is a utility program for spinning-down external disks after a period "
-"of idle time."
-msgstr ""
-"设定外部磁盘在一段空闲时间（idle-time)到达后降速(spin down)，从而起到一定的保"
-"护和省电作用，仅对硬盘起效。"
+msgid "hd-idle is a utility program for spinning-down external disks after a period of idle time."
+msgstr "设定外置硬盘在设定的空闲时间(idle-time)到达后降速(spin down)，从而起到一定的保护和省电作用。"
 
 msgid "Settings"
 msgstr "设置"
 
 msgid "Enable"
-msgstr "启用hd-idle"
+msgstr "启用"
 
 msgid "Disk"
 msgstr "选择磁盘"
diff --git a/po/zh_CN/p910nd.po b/po/zh_CN/p910nd.po
new file mode 100644
index 000000000..402237a28
--- /dev/null
+++ b/po/zh_CN/p910nd.po
@@ -0,0 +1,33 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-19 19:35+0200\n"
+"PO-Revision-Date: 2011-05-16 19:10+0700\n"
+"Last-Translator: Our Teammates\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+#. p910nd - Printer server
+#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
+msgid "p910nd - Printer server"
+msgstr "p910nd - 打印服务器"
+
+#. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
+#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
+msgid "First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp)."
+msgstr "首先你必须安装支持USB打印机的驱动(kmod-usb-printer)或者并行端口驱动(kmod-lp)"
+
+#. Bidirectional mode
+#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
+msgid "Bidirectional mode"
+msgstr "双向模式"
+
+#. p910nd listens on port 910+N. E.g. 9100 for the first printer.
+#: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
+msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
+msgstr "p910nd 的监听端口是910+N，举例：9100用于监听第一台打印机"
+
diff --git a/po/zh_CN/upnp.po b/po/zh_CN/upnp.po
index d50330a77..43458f9de 100644
--- a/po/zh_CN/upnp.po
+++ b/po/zh_CN/upnp.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2011-04-22 01:15-0800\n"
+"PO-Revision-Date: 2011-05-16 19:10+0700\n"
 "Last-Translator: Our Teammates\n"
 "Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -11,16 +11,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1\n"
 
-msgid ""
-"ACLs specify which external ports may be redirected to which internal "
-"addresses and ports"
+msgid "ACLs specify which external ports may be redirected to which internal addresses and ports"
 msgstr "指定外部端口的ACL可能会被重定向至某些内部地址及端口"
 
 msgid "Action"
 msgstr "动作"
 
 msgid "Active UPnP Redirects"
-msgstr ""
+msgstr "活动的UPnP重定向"
 
 msgid "Advanced Settings"
 msgstr "高级设置"
@@ -41,19 +39,19 @@ msgid "Clean rules threshold"
 msgstr "启动时清除端口转发"
 
 msgid "Client Address"
-msgstr ""
+msgstr "客户端地址"
 
 msgid "Client Port"
-msgstr ""
+msgstr "客户端端口"
 
 msgid "Collecting data..."
-msgstr ""
+msgstr "正在收集数据"
 
 msgid "Comment"
 msgstr "备注"
 
 msgid "Delete Redirect"
-msgstr ""
+msgstr "删除重定向"
 
 msgid "Device UUID"
 msgstr "设备UUID"
@@ -71,10 +69,10 @@ msgid "Enable additional logging"
 msgstr "启用额外的日志记录"
 
 msgid "Enable secure mode"
-msgstr "启用安全模式(当启用时，UPnP的客户可以只映射到其IP)"
+msgstr "启用安全模式<br>--当启用时，UPnP的客户可以只映射到其IP"
 
 msgid "External Port"
-msgstr ""
+msgstr "外部端口"
 
 msgid "External ports"
 msgstr "外部端口"
@@ -104,7 +102,7 @@ msgid "Presentation URL"
 msgstr "显示URL"
 
 msgid "Protocol"
-msgstr ""
+msgstr "协议"
 
 msgid "Puts extra debugging information into the system log"
 msgstr "提取额外的调试信息至系统日志"
@@ -113,19 +111,12 @@ msgid "Report system instead of daemon uptime"
 msgstr "回报系统当前状态，忽略后台运行时间"
 
 msgid "Start UPnP and NAT-PMP service"
-msgstr "启用UPnP与NAT-PMP服务"
+msgstr "启动UPnP与NAT-PMP服务"
 
 msgid "There are no active redirects."
-msgstr ""
-
-msgid ""
-"UPNP allows clients in the local network to automatically configure the "
-"router."
-msgstr ""
+msgstr "没有活动的重定向"
 
-msgid ""
-"UPnP allows clients in the local network to automatically configure the "
-"router."
+msgid "UPnP allows clients in the local network to automatically configure the router."
 msgstr "UPnP允许局域网内客户端自动设置路由上的端口转发。"
 
 msgid "UPnP lease file"
@@ -141,4 +132,5 @@ msgid "Value in KByte/s, informational only"
 msgstr "值为KByte/s，仅供参考"
 
 msgid "enable"
-msgstr ""
+msgstr "启用"
+
diff --git a/po/zh_CN/upnp.po~ b/po/zh_CN/upnp.po~
new file mode 100644
index 000000000..eddc9021c
--- /dev/null
+++ b/po/zh_CN/upnp.po~
@@ -0,0 +1,112 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-06-10 03:40+0200\n"
+"PO-Revision-Date: 2011-04-22 01:15-0800\n"
+"Last-Translator: Our Teammates\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 1.1.1\n"
+
+msgid "Universal Plug & Play"
+msgstr "通用即插即用(UPnP)"
+
+msgid ""
+"UPnP allows clients in the local network to automatically configure the "
+"router."
+msgstr "UPnP允许局域网内客户端自动设置路由上的端口转发。"
+
+msgid "MiniUPnP settings"
+msgstr "MiniUPnP设置"
+
+msgid "General Settings"
+msgstr "一般设置"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Start UPnP and NAT-PMP service"
+msgstr "启用UPnP与NAT-PMP服务"
+
+msgid "Enable UPnP functionality"
+msgstr "启用UPnP功能"
+
+msgid "Enable NAT-PMP functionality"
+msgstr "启用NAT-PMP功能"
+
+msgid "Enable secure mode"
+msgstr "启用安全模式(当启用时，UPnP的客户可以只映射到其IP)"
+
+msgid "Allow adding forwards only to requesting ip addresses"
+msgstr "允许添加只转发给请求的IP地址"
+
+msgid "Enable additional logging"
+msgstr "启用额外的日志记录"
+
+msgid "Puts extra debugging information into the system log"
+msgstr "提取额外的调试信息至系统日志"
+
+msgid "Downlink"
+msgstr "下行"
+
+msgid "Value in KByte/s, informational only"
+msgstr "值为KByte/s，仅供参考"
+
+msgid "Uplink"
+msgstr "上行"
+
+msgid "Port"
+msgstr "端口"
+
+msgid "Report system instead of daemon uptime"
+msgstr "回报系统当前状态，忽略后台运行时间"
+
+msgid "Device UUID"
+msgstr "设备UUID"
+
+msgid "Announced serial number"
+msgstr "公布的序列号"
+
+msgid "Announced model number"
+msgstr "公布的型号"
+
+msgid "Notify interval"
+msgstr "警报间隔"
+
+msgid "Clean rules threshold"
+msgstr "启动时清除端口转发"
+
+msgid "Clean rules interval"
+msgstr "定时自动清除无效规则"
+
+msgid "Presentation URL"
+msgstr "显示URL"
+
+msgid "UPnP lease file"
+msgstr "UPnP租约文件"
+
+msgid "MiniUPnP ACLs"
+msgstr "MiniUPnP的ACL"
+
+msgid ""
+"ACLs specify which external ports may be redirected to which internal "
+"addresses and ports"
+msgstr "指定外部端口的ACL可能会被重定向至某些内部地址及端口"
+
+msgid "Comment"
+msgstr "备注"
+
+msgid "External ports"
+msgstr "外部端口"
+
+msgid "Internal addresses"
+msgstr "内部地址"
+
+msgid "Internal ports"
+msgstr "内部端口"
+
+msgid "Action"
+msgstr "动作"
diff --git a/po/zh_CN/wol.po b/po/zh_CN/wol.po
new file mode 100644
index 000000000..1b91f0ce3
--- /dev/null
+++ b/po/zh_CN/wol.po
@@ -0,0 +1,45 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-19 00:29+0200\n"
+"PO-Revision-Date: 2011-05-16 19:11+0700\n"
+"Last-Translator: Our Teammates\n"
+"Language-Team: QQ Group 75543259 <axishero@foxmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Wake on LAN"
+msgstr "网络唤醒"
+
+msgid "Wake on LAN is a mechanism to remotely boot computers in the local network."
+msgstr "网络唤醒提供了从远程启动本地网络内计算机的机制。"
+
+msgid "Wake up host"
+msgstr "唤醒主机"
+
+msgid "Starting WoL utility:"
+msgstr "正在启动网络唤醒工具"
+
+msgid "WoL program"
+msgstr "网络唤醒程序"
+
+msgid "Sometimes only one of both tools work. If one of fails, try the other one"
+msgstr "有时只有一个工具生效。如果其中一个失效，请尝试另一个"
+
+msgid "Network interface to use"
+msgstr "选择使用的网络接口"
+
+msgid "Specifies the interface the WoL packet is sent on"
+msgstr "限定网络唤醒数据包将被发送到的接口"
+
+msgid "Broadcast on all interfaces"
+msgstr "向所有接口广播"
+
+msgid "Host to wake up"
+msgstr "选择要唤醒的主机"
+
+msgid "Choose the host to wake up or enter a custom MAC address to use"
+msgstr "选择要唤醒的主机或者输入自定义mac地址"
+