8 files changed, 91 insertions, 37 deletions
diff --git a/po/zh_CN/ahcp.po b/po/zh_CN/ahcp.po
index c212ada937..295bbe7f12 100644
--- a/po/zh_CN/ahcp.po
+++ b/po/zh_CN/ahcp.po
@@ -14,14 +14,16 @@ msgstr ""
 msgid "AHCP Server"
 msgstr "AHCP 服务器"
 
+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
-"networks designed to be used in place of router discovery and DHCP on "
+"networks designed to be used in place of router discovery or DHCP on "
 "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双栈网络的协议，用于在网络上进行路由探测和地"
+"址分配。因为在某些网络上为每个链路层广播域均配置服务器是非常困难的，例如移动"
+"ad-hoc网络。"
 
 msgid "Active AHCP Leases"
 msgstr "活动的AHCP租约"
diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index ef711da751..b66e2e9c54 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -802,8 +802,9 @@ msgstr "扩展HOSTS文件中的主机后缀"
 msgid "Expires"
 msgstr "到期时间"
 
+#, fuzzy
 msgid ""
-"Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."
+"Expiry time of leased addresses, minimum is 2 minutes (<code>2m</code>)."
 msgstr "地址租期，最小2分钟(<code>2m</code>)。"
 
 msgid "External"
@@ -1211,9 +1212,10 @@ msgstr "无效的VLAN ID! 只允许唯一的ID。"
 msgid "Invalid username and/or password! Please try again."
 msgstr "无效的用户名和/或密码! 请重试。"
 
+#, fuzzy
 msgid ""
-"It appears that you try to flash an image that does not fit into the flash "
-"memory, please verify the image file!"
+"It appears that you are trying to flash an image that does not fit into the "
+"flash memory, please verify the image file!"
 msgstr "将要刷新的固件与本路由器不兼容，请重新验证固件文件。"
 
 msgid "Java Script required!"
@@ -1347,9 +1349,10 @@ msgstr "本地时间"
 msgid "Local domain"
 msgstr "本地域名"
 
+#, fuzzy
 msgid ""
-"Local domain specification. Names matching this domain are never forwared "
-"and resolved from DHCP or hosts files only"
+"Local domain specification. Names matching this domain are never forwarded "
+"and are resolved from DHCP or hosts files only"
 msgstr "本地域名规则。从不转发和处理只源自DHCP或HOSTS文件的本地域名数据"
 
 msgid "Local domain suffix appended to DHCP names and hosts file entries"
@@ -1897,6 +1900,14 @@ msgstr ""
 msgid "Really reset all changes?"
 msgstr "确定要放弃所有更改？"
 
+#, fuzzy
+msgid ""
+"Really shut down network?\\nYou might lose access to this device if you are "
+"connected via this interface."
+msgstr ""
+"确定要关闭此网络？\\\n"
+"关闭此网络，可能导致无法再访问路由器！"
+
 msgid ""
 "Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
@@ -1904,13 +1915,6 @@ msgstr ""
 "确定要关闭接口\"%s\" ？\\\n"
 "删除此网络，可能导致无法再访问路由器！"
 
-msgid ""
-"Really shutdown network ?\\nYou might lose access to this device if you are "
-"connected via this interface."
-msgstr ""
-"确定要关闭此网络？\\\n"
-"关闭此网络，可能导致无法再访问路由器！"
-
 msgid "Really switch protocol?"
 msgstr "确定要切换协议？"
 
@@ -2110,12 +2114,13 @@ msgstr "服务类型"
 msgid "Services"
 msgstr "服务"
 
+#, fuzzy
+msgid "Set up Time Synchronization"
+msgstr "设置时间同步"
+
 msgid "Setup DHCP Server"
 msgstr "配置DHCP服务器"
 
-msgid "Setup Time Synchronization"
-msgstr "设置时间同步"
-
 msgid "Show current backup file list"
 msgstr "显示当前文件备份列表"
 
@@ -2158,8 +2163,9 @@ msgstr "对不起，请求的目标未找到。"
 msgid "Sorry, the server encountered an unexpected error."
 msgstr "对不起，服务器遇到未知错误。"
 
+#, fuzzy
 msgid ""
-"Sorry, there is no sysupgrade support present, a new firmware image must be "
+"Sorry, there is no sysupgrade support present; a new firmware image must be "
 "flashed manually. Please refer to the OpenWrt wiki for device specific "
 "install instructions."
 msgstr ""
@@ -2302,12 +2308,13 @@ msgstr "对象"
 msgid "Terminate"
 msgstr "关闭"
 
+#, fuzzy
 msgid ""
 "The <em>Device Configuration</em> section covers physical settings of the "
-"radio hardware such as channel, transmit power or antenna selection which is "
-"shared among all defined wireless networks (if the radio hardware is multi-"
-"SSID capable). Per network settings like encryption or operation mode are "
-"grouped in the <em>Interface Configuration</em>."
+"radio hardware such as channel, transmit power or antenna selection which "
+"are shared among all defined wireless networks (if the radio hardware is "
+"multi-SSID capable). Per network settings like encryption or operation mode "
+"are grouped in the <em>Interface Configuration</em>."
 msgstr ""
 "<em>设备配置</em>区域可配置无线的硬件参数，比如信道、发射功率或发射天线(如果"
 "此无线模块硬件支持多SSID，则全部SSID共用此设备配置)。<em>接口配置</em>区域则"
@@ -2367,9 +2374,10 @@ msgstr "系统中的活跃连接。"
 msgid "The given network name is not unique"
 msgstr "给定的网络名重复"
 
+#, fuzzy
 msgid ""
-"The hardware is not multi-SSID capable and existing configuration will be "
-"replaced if you proceed."
+"The hardware is not multi-SSID capable and the existing configuration will "
+"be replaced if you proceed."
 msgstr "本机的硬件不支持多SSID，继续进行将会覆盖现有配置。"
 
 msgid ""
@@ -2401,9 +2409,10 @@ msgid ""
 "when finished."
 msgstr "系统正在删除配置分区，完成后会自动重启。"
 
+#, fuzzy
 msgid ""
 "The system is flashing now.<br /> DO NOT POWER OFF THE DEVICE!<br /> Wait a "
-"few minutes until you try to reconnect. It might be necessary to renew the "
+"few minutes before you try to reconnect. It might be necessary to renew the "
 "address of your computer to reach the device again, depending on your "
 "settings."
 msgstr ""
diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index dd0397de22..03c1b003b8 100644
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -392,12 +392,13 @@ msgid ""
 "entry, such as matched source and destination hosts."
 msgstr "本页面可以更改通信规则的高级设置，比如：需匹配的源主机和目标主机。"
 
+#, fuzzy
 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."
+"networks</em> specifies which available networks are members of this zone."
 msgstr ""
 "本节定义 %q 的通用属性， <em>入站数据</em> 和 <em>出站数据</em>规则用于设置数"
 "据包“进”和“出”路由器（某个接口）默认的转发原则，<em>转发</em>规则用于特定（一"
diff --git a/po/zh_CN/meshwizard.po b/po/zh_CN/meshwizard.po
index 9dab50876b..d5d0707f17 100644
--- a/po/zh_CN/meshwizard.po
+++ b/po/zh_CN/meshwizard.po
@@ -65,9 +65,10 @@ msgstr "Mesh IPv6地址"
 msgid "Mesh Wizard"
 msgstr "Mesh 导引"
 
+#, fuzzy
 msgid ""
-"Note: this will setup this interface for mesh operation, i.e. add to zone "
-"'freifunk' and enable olsr."
+"Note: this will set up this interface for mesh operation, i.e. add it to "
+"zone 'freifunk' and enable olsr."
 msgstr "注意：这将为mesh操作建立一个接口，如:增加到‘freifunk’区域并使能olsr"
 
 msgid "Protect LAN"
diff --git a/po/zh_CN/olsr.po b/po/zh_CN/olsr.po
index 2f3cb8caf1..37264f584a 100644
--- a/po/zh_CN/olsr.po
+++ b/po/zh_CN/olsr.po
@@ -50,6 +50,9 @@ msgstr "广播地址"
 msgid "Can only be a valid IPv4 or IPv6 address or 'default'"
 msgstr ""
 
+msgid "Can only be a valid IPv6 address or 'default'"
+msgstr ""
+
 msgid "Configuration"
 msgstr "配置"
 
@@ -133,6 +136,10 @@ msgstr "HNA间隙"
 msgid "HNA validity time"
 msgstr "HNA有效时长"
 
+#, fuzzy
+msgid "HNA6 Announcements"
+msgstr "HNA公告"
+
 msgid "Hello"
 msgstr "Hello"
 
@@ -166,6 +173,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"Hosts in a OLSR routed network can announce connecitivity to external "
+"networks using HNA6 messages."
+msgstr ""
+
+msgid ""
 "Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more "
 "robustness to the link sensing but delays neighbor registration. Defaults is "
 "\"yes\""
@@ -370,6 +382,13 @@ msgid ""
 "nodes on this interface by 20%: default 0.8"
 msgstr ""
 
+msgid ""
+"Multiply routes with the factor given here. Allowed values are between 0.01 "
+"and 1.0. It is only used when LQ-Level is greater than 0. Examples:<br /"
+">reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5<br />reduce "
+"LQ to all nodes on this interface by 20%: default 0.8"
+msgstr ""
+
 msgid "NAT threshold"
 msgstr ""
 
@@ -409,6 +428,10 @@ msgstr ""
 msgid "OLSR - HNA-Announcements"
 msgstr ""
 
+#, fuzzy
+msgid "OLSR - HNA6-Announcements"
+msgstr "HNA公告"
+
 msgid "OLSR - Plugins"
 msgstr ""
 
@@ -496,6 +519,12 @@ msgid ""
 "IP of the first interface."
 msgstr ""
 
+msgid ""
+"Sets the main IP (originator ip) of the router. This IP will NEVER change "
+"during the uptime of olsrd. Default is ::, which triggers usage of the IP of "
+"the first interface."
+msgstr ""
+
 msgid "Show IPv4"
 msgstr ""
 
@@ -645,6 +674,12 @@ msgid ""
 "Default setting is \"both\"."
 msgstr ""
 
+msgid ""
+"Which kind of uplink is exported to the other mesh nodes. An uplink is "
+"detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default "
+"setting is \"both\"."
+msgstr ""
+
 msgid "Willingness"
 msgstr ""
 
diff --git a/po/zh_CN/watchcat.po b/po/zh_CN/watchcat.po
index 0482e95d2f..991fc48a23 100644
--- a/po/zh_CN/watchcat.po
+++ b/po/zh_CN/watchcat.po
@@ -49,14 +49,16 @@ msgstr "ping周期"
 msgid "Watchcat"
 msgstr "WatchCat"
 
+#, fuzzy
 msgid ""
-"Watchcat allows to configure a periodic reboot and/or when internet "
-"connection has been lost for a certain period of time."
+"Watchcat allows configuring a periodic reboot when the Internet connection "
+"has been lost for a certain period of time."
 msgstr "WatchCat允许设置周期性的重启 和/或者 当网络连接断开达规定时间。"
 
+#, fuzzy
 msgid ""
-"When rebooting the system the watchcat will trigger a soft reboot, Entering "
-"a non zero value here, will trigger a delayed hard reboot if the soft reboot "
+"When rebooting the system, the watchcat will trigger a soft reboot. Entering "
+"a non zero value here will trigger a delayed hard reboot if the soft reboot "
 "fails. Enter a number of seconds to enable, use 0 to disable"
 msgstr ""
 "当重启系统的时候WatchCat将会触发一个软重启，在这里输入一个非0的值，如果软重启"
diff --git a/po/zh_CN/wol.po b/po/zh_CN/wol.po
index c44f0886eb..6d9cc7227e 100644
--- a/po/zh_CN/wol.po
+++ b/po/zh_CN/wol.po
@@ -25,8 +25,9 @@ msgstr "选择要唤醒的主机"
 msgid "Network interface to use"
 msgstr "选择使用的网络接口"
 
+#, fuzzy
 msgid ""
-"Sometimes only one of both tools work. If one of fails, try the other one"
+"Sometimes only one of the two tools works. If one fails, try the other one"
 msgstr "有时只有一个工具生效。如果其中一个失效，请尝试另一个"
 
 msgid "Specifies the interface the WoL packet is sent on"
diff --git a/po/zh_CN/wshaper.po b/po/zh_CN/wshaper.po
index ccfd096b22..a35ccd02d0 100644
--- a/po/zh_CN/wshaper.po
+++ b/po/zh_CN/wshaper.po
@@ -49,7 +49,10 @@ msgstr "Wondershaper"
 msgid "Wondershaper settings"
 msgstr "Wondershaper设置"
 
+#, fuzzy
 msgid ""
-"Wondershaper uses traffic shaping to ensure low latencies for interactive "
-"traffic even when your internet connection is highly saturated."
-msgstr "Wondershaper通过流量匹配,确保低延时的交互数据包，甚至当你的互联网连接是高度饱和。"
+"Wondershaper shapes traffic to ensure low latencies for interactive traffic "
+"even when your internet connection is highly saturated."
+msgstr ""
+"Wondershaper通过流量匹配,确保低延时的交互数据包，甚至当你的互联网连接是高度饱"
+"和。"