13 files changed, 102 insertions, 32 deletions
diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index ba1b5c804..227a546f2 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -237,6 +237,11 @@ msgstr "允许127.0.0.0/8回环范围内的上行响应，例如：RBL服务"
 msgid "Allowed range is 1 to 65535"
 msgstr "允许的范围：1 到 65535"
 
+msgid ""
+"Always use 40MHz channels even if the secondary channel overlaps. Using this "
+"option does not comply with IEEE 802.11n-2009!"
+msgstr ""
+
 msgid "An additional network will be created if you leave this unchecked."
 msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置"
 
@@ -828,6 +833,9 @@ msgstr "刷写中..."
 msgid "Force"
 msgstr "强制开启DHCP"
 
+msgid "Force 40MHz mode"
+msgstr ""
+
 msgid "Force CCMP (AES)"
 msgstr "强制使用CCMP(AES)加密"
 
@@ -2240,8 +2248,8 @@ msgid ""
 "\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></"
 "samp>)"
 msgstr ""
-"用于格式化存储器的文件系统，(<abbr title=\"for example\">例如</abbr> <samp><abbr title=\"Third "
-"Extended Filesystem\">ext4</abbr></samp>)"
+"用于格式化存储器的文件系统，(<abbr title=\"for example\">例如</abbr> "
+"<samp><abbr title=\"Third Extended Filesystem\">ext4</abbr></samp>)"
 
 msgid ""
 "The flash image was uploaded. Below is the checksum and file size listed, "
@@ -2825,7 +2833,9 @@ msgstr "« 后退"
 #~ "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>."
+#~ msgstr ""
+#~ "请选择你需要链接到无线网络接口的网络. 如果不链接到任何网络请选择 <em>未指"
+#~ "定</em>,如果需要创建新网络请点<em>创建</em>."
 
 #~ msgid "Create Network"
 #~ msgstr "创建一个网络"
@@ -2867,7 +2877,8 @@ 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 ""
 #~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
@@ -2910,9 +2921,10 @@ msgstr "« 后退"
 #~ "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>也常用于分割不同网段；默认通常是一条上传端口连接ISP，其余端口为本地子网。"
+#~ "本设备可以划分为多个<abbr title=\"Virtual Local Area Network\">VLAN</"
+#~ "abbr>，并支持电脑间的直接通讯；<abbr title=\"Virtual Local Area Network"
+#~ "\">VLAN</abbr>也常用于分割不同网段；默认通常是一条上传端口连接ISP，其余端"
+#~ "口为本地子网。"
 
 #~ msgid "Enable buffering"
 #~ msgstr "开启缓冲"
diff --git a/po/zh_CN/commands.po b/po/zh_CN/commands.po
index ac0b9de2e..6fbb9834e 100644
--- a/po/zh_CN/commands.po
+++ b/po/zh_CN/commands.po
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "A short textual description of the configured command"
diff --git a/po/zh_CN/ddns.po b/po/zh_CN/ddns.po
index 5b96eeb69..6dbf5a234 100644
--- a/po/zh_CN/ddns.po
+++ b/po/zh_CN/ddns.po
@@ -34,6 +34,9 @@ msgstr ""
 msgid "Enable"
 msgstr "启用"
 
+msgid "Event interface"
+msgstr ""
+
 msgid "Force update every"
 msgstr "强制更新间隔"
 
@@ -49,6 +52,9 @@ msgstr "接口"
 msgid "Network"
 msgstr "网络"
 
+msgid "On which interface up should start the ddns script process."
+msgstr ""
+
 msgid "Password"
 msgstr "密码"
 
@@ -80,9 +86,3 @@ msgstr "分"
 
 msgid "network"
 msgstr "网络"
-
-msgid "Event interface"
-msgstr ""
-
-msgid "On which interface up should start the ddns script process."
-msgstr ""
diff --git a/po/zh_CN/diag_devinfo.po b/po/zh_CN/diag_devinfo.po
index d75c89748..7346ef98c 100644
--- a/po/zh_CN/diag_devinfo.po
+++ b/po/zh_CN/diag_devinfo.po
@@ -181,6 +181,9 @@ msgstr ""
 msgid "Scanning Configuration"
 msgstr ""
 
+msgid "Scans for devices on specified networks."
+msgstr ""
+
 msgid "Sleep Between Requests"
 msgstr ""
 
@@ -204,6 +207,3 @@ msgstr ""
 
 msgid "check other networks"
 msgstr ""
-
-msgid "Scans for devices on specified networks."
-msgstr ""
diff --git a/po/zh_CN/firewall.po b/po/zh_CN/firewall.po
index ef0c77d21..0174bf13e 100644
--- a/po/zh_CN/firewall.po
+++ b/po/zh_CN/firewall.po
@@ -399,8 +399,10 @@ msgid ""
 "forwarded traffic between different networks within the zone. <em>Covered "
 "networks</em> specifies which available networks are member of this zone."
 msgstr ""
-"本节定义 %q 的通用属性， <em>入站数据</em> 和 <em>出站数据</em>规则用于设置数据包“进”和“出”路由器（某个接口）默认的转发原则"
-"，<em>转发</em>规则用于特定（一个或多个）区域的不同子网之间的数据包转发。<em>覆盖网络</em>选择从属于这个区域的网络。"
+"本节定义 %q 的通用属性， <em>入站数据</em> 和 <em>出站数据</em>规则用于设置数"
+"据包“进”和“出”路由器（某个接口）默认的转发原则，<em>转发</em>规则用于特定（一"
+"个或多个）区域的不同子网之间的数据包转发。<em>覆盖网络</em>选择从属于这个区域"
+"的网络。"
 
 msgid "To %s at %s on <var>this device</var>"
 msgstr "到 %s at %s 位于<var>本设备</var>"
diff --git a/po/zh_CN/freifunk.po b/po/zh_CN/freifunk.po
index fc3d68f90..48121f00b 100644
--- a/po/zh_CN/freifunk.po
+++ b/po/zh_CN/freifunk.po
@@ -82,6 +82,9 @@ msgstr ""
 msgid "Edit index page"
 msgstr ""
 
+msgid "Enable IPv6"
+msgstr ""
+
 msgid "Error"
 msgstr ""
 
@@ -115,6 +118,15 @@ msgstr ""
 msgid "Hostname"
 msgstr ""
 
+msgid "IPv6 Config"
+msgstr ""
+
+msgid "IPv6 Prefix"
+msgstr ""
+
+msgid "IPv6 network in CIDR notation."
+msgstr ""
+
 msgid "If selected then the default content element is not shown."
 msgstr ""
 
diff --git a/po/zh_CN/meshwizard.po b/po/zh_CN/meshwizard.po
index cd437f138..cf9926c0d 100644
--- a/po/zh_CN/meshwizard.po
+++ b/po/zh_CN/meshwizard.po
@@ -13,6 +13,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.6\n"
 
+msgid "Activate or deactivate IPv6 config globally."
+msgstr ""
+
 msgid "Channel"
 msgstr "频道"
 
@@ -34,9 +37,18 @@ msgstr "DHCP将自动给客户端分配IP地址"
 msgid "Enable DHCP"
 msgstr "启动DHCP"
 
+msgid "Enable RA"
+msgstr ""
+
+msgid "Enabled"
+msgstr ""
+
 msgid "General Settings"
 msgstr "总体设置"
 
+msgid "IPv6 Settings"
+msgstr ""
+
 msgid ""
 "If this is selected then config is cleaned before setting new config options."
 msgstr "如果此项被选中，在设置新选项之前，配置将被清空。"
@@ -47,9 +59,17 @@ msgstr "界面"
 msgid "Mesh IP address"
 msgstr "Mesh IP 地址"
 
+msgid "Mesh IPv6 address"
+msgstr ""
+
 msgid "Mesh Wizard"
 msgstr "Mesh 导引"
 
+msgid ""
+"Note: this will setup this interface for mesh operation, i.e. add to zone "
+"'freifunk' and enable olsr."
+msgstr ""
+
 msgid "Protect LAN"
 msgstr ""
 
@@ -57,6 +77,9 @@ msgid ""
 "Select this to allow others to use your connection to access the internet."
 msgstr ""
 
+msgid "Send router advertisements on this device."
+msgstr ""
+
 msgid "Share your internet connection"
 msgstr ""
 
@@ -71,6 +94,11 @@ msgid "The given IP address is not inside the mesh network range"
 msgstr ""
 
 msgid ""
+"This is a unique IPv6 address in CIDR notation (e.g. 2001:1:2:3::1/64) and "
+"has to be registered at your local community."
+msgstr ""
+
+msgid ""
 "This is a unique address in the mesh (e.g. 10.1.1.1) and has to be "
 "registered at your local community."
 msgstr ""
diff --git a/po/zh_CN/minidlna.po b/po/zh_CN/minidlna.po
index 384140436..e699392de 100644
--- a/po/zh_CN/minidlna.po
+++ b/po/zh_CN/minidlna.po
@@ -125,7 +125,9 @@ msgid ""
 "Set this to strictly adhere to DLNA standards. This will allow server-side "
 "downscaling of very large JPEG images, which may hurt JPEG serving "
 "performance on (at least) Sony DLNA products."
-msgstr "设定严格遵守DLNA标准。这将允许服务器端降小大尺寸JPEG图像，在（至少）索尼DLNA的产品这可能会降低JPEG服务性能。"
+msgstr ""
+"设定严格遵守DLNA标准。这将允许服务器端降小大尺寸JPEG图像，在（至少）索尼DLNA"
+"的产品这可能会降低JPEG服务性能。"
 
 msgid ""
 "Set this to the directory you want scanned. If you want to restrict the "
@@ -133,8 +135,9 @@ msgid ""
 "audio, 'V' for video, 'P' for images), followed by a comma, to the directory "
 "(eg. media_dir=A,/mnt/media/Music). Multiple directories can be specified."
 msgstr ""
-"设置要扫描的目录。如果你想限制特定内容类型的目录，你可以在前面加上类型（用于音频'A'，'V'视频，'P'图片），其次是用逗号分隔的目录（如media_"
-"dir = A，/ mnt/媒体/音乐）。可以指定多个目录。"
+"设置要扫描的目录。如果你想限制特定内容类型的目录，你可以在前面加上类型（用于"
+"音频'A'，'V'视频，'P'图片），其次是用逗号分隔的目录（如media_dir = A，/ mnt/"
+"媒体/音乐）。可以指定多个目录。"
 
 msgid "Specify the path to the MiniSSDPd socket."
 msgstr "指定MiniSSDPd socket的路径。"
diff --git a/po/zh_CN/splash.po b/po/zh_CN/splash.po
index b4c84bba0..34b6a78b4 100644
--- a/po/zh_CN/splash.po
+++ b/po/zh_CN/splash.po
@@ -33,7 +33,9 @@ msgid ""
 "Bandwidth limit for clients is only activated when both up- and download "
 "limit are set. Use a value of 0 here to completely disable this limitation. "
 "Whitelisted clients are not limited."
-msgstr "只有当 上传和下载的限制都设置的时候对客户端的带宽限制才会生效。在这里使用0 可以完全禁用此限制。白名单客户端不受限制。"
+msgstr ""
+"只有当 上传和下载的限制都设置的时候对客户端的带宽限制才会生效。在这里使用0 可"
+"以完全禁用此限制。白名单客户端不受限制。"
 
 # Something wwrong?
 msgid ""
diff --git a/po/zh_CN/tinyproxy.po b/po/zh_CN/tinyproxy.po
index 9a35e95c6..af7d3652f 100644
--- a/po/zh_CN/tinyproxy.po
+++ b/po/zh_CN/tinyproxy.po
@@ -15,7 +15,9 @@ msgid ""
 "<em>Via proxy</em> routes requests to the given target via the specifed "
 "upstream proxy, <em>Reject access</em> disables any upstream proxy for the "
 "target"
-msgstr "<em>通过代理</em>允许给定的对象经过指定的上行代理的路由请求。<em>拒绝代理</em> 禁用对象的任何上行代理。"
+msgstr ""
+"<em>通过代理</em>允许给定的对象经过指定的上行代理的路由请求。<em>拒绝代理</"
+"em> 禁用对象的任何上行代理。"
 
 msgid ""
 "Adds an \"X-Tinyproxy\" HTTP header with the client IP address to forwarded "
@@ -34,7 +36,8 @@ msgstr "绑定地址"
 msgid ""
 "By default, basic POSIX expressions are used for filtering. Enable this to "
 "activate extended regular expressions"
-msgstr "默认情况下，使用基本的POSIX表达式作为滤规则。启用这个以使用正规表达式代替之。"
+msgstr ""
+"默认情况下，使用基本的POSIX表达式作为滤规则。启用这个以使用正规表达式代替之。"
 
 msgid ""
 "By default, filter strings are treated as case-insensitive. Enable this to "
@@ -49,7 +52,8 @@ msgstr "默认情况下，过滤器只匹配域名。启用它以匹配URL。"
 msgid ""
 "By default, the filter rules act as blacklist. Enable this option to only "
 "allow matched URLs or domain names"
-msgstr "默认情况下，过滤规则将以黑名单形式匹配。启用它将仅允许过滤规则里的URL或域名。"
+msgstr ""
+"默认情况下，过滤规则将以黑名单形式匹配。启用它将仅允许过滤规则里的URL或域名。"
 
 msgid ""
 "Can be either an IP address or range, a domain name or \".\" for any host "
diff --git a/po/zh_CN/ushare.po b/po/zh_CN/ushare.po
index 1a22a2e79..f426526e6 100644
--- a/po/zh_CN/ushare.po
+++ b/po/zh_CN/ushare.po
@@ -47,4 +47,6 @@ msgid ""
 "uShare is a UPnP (TM) A/V & DLNA Media Server. It implements the server "
 "component that provides UPnP media devices with information on available "
 "multimedia files."
-msgstr "uShare是一个UPnP(TM) A/V和DLNA媒体服务器。可以将多媒体文件共享到支持UPnP的设备上。"
+msgstr ""
+"uShare是一个UPnP(TM) A/V和DLNA媒体服务器。可以将多媒体文件共享到支持UPnP的设"
+"备上。"
diff --git a/po/zh_CN/uvc_streamer.po b/po/zh_CN/uvc_streamer.po
index 501c86810..3e4bb0ae0 100644
--- a/po/zh_CN/uvc_streamer.po
+++ b/po/zh_CN/uvc_streamer.po
@@ -38,4 +38,5 @@ msgstr "网络相机流"
 msgid ""
 "Configure your Linux-UVC compatible webcam. Point your browser to e.g. <a "
 "href=\"http://%s:%i/\">http://%s:%i/</a>"
-msgstr "配置兼容的网络相机。用浏览器访问<a href=\"http://%s:%i/\">http://%s:%i/</a>"
+msgstr ""
+"配置兼容的网络相机。用浏览器访问<a href=\"http://%s:%i/\">http://%s:%i/</a>"
diff --git a/po/zh_CN/watchcat.po b/po/zh_CN/watchcat.po
index ee9d7b1f1..0482e95d2 100644
--- a/po/zh_CN/watchcat.po
+++ b/po/zh_CN/watchcat.po
@@ -20,7 +20,9 @@ msgstr "ping主机地址"
 msgid ""
 "How often to check internet connection. Default unit is seconds, you can you "
 "use the suffix 'm' for minutes, 'h' for hours or 'd' for days"
-msgstr "检测网络连接的频率。默认单位为秒，你可以使用'm'作为后缀表示分钟，‘h’表示小时‘d’表示天。"
+msgstr ""
+"检测网络连接的频率。默认单位为秒，你可以使用'm'作为后缀表示分钟，‘h’表示小"
+"时‘d’表示天。"
 
 msgid ""
 "In periodic mode, it defines the reboot period. In internet mode, it defines "
@@ -28,8 +30,9 @@ msgid ""
 "engaged.Default unit is seconds, you can use the suffix 'm' for minutes, 'h' "
 "for hours or 'd' for days"
 msgstr ""
-"在周期模式，此处定义了重启的周期。在联网模式，这个表示没有网络连接情况下到执行重启的最长时间间隔。默认单位为秒，你可以使用'm'作为后缀表示分钟，‘h’"
-"表示小时‘d’表示天。"
+"在周期模式，此处定义了重启的周期。在联网模式，这个表示没有网络连接情况下到执"
+"行重启的最长时间间隔。默认单位为秒，你可以使用'm'作为后缀表示分钟，‘h’表示小"
+"时‘d’表示天。"
 
 msgid "Operating mode"
 msgstr "操作模式"
@@ -56,4 +59,5 @@ msgid ""
 "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的值，如果软重启失败将会触发一个延迟的硬重启。输入秒数启用，输入0禁止功能。"
+"当重启系统的时候WatchCat将会触发一个软重启，在这里输入一个非0的值，如果软重启"
+"失败将会触发一个延迟的硬重启。输入秒数启用，输入0禁止功能。"