po: resync translations

1 files changed, 90 insertions, 51 deletions

diff --git a/po/zh_CN/base.po b/po/zh_CN/base.po
index 656204a0f..638d44fb4 100644
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
@@ -52,11 +52,6 @@ msgstr "5分钟负载:"
 msgid "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 msgstr "<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"
 
-msgid ""
-"<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/"
-"prefix"
-msgstr "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-标识：地址/前缀"
-
 msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 
@@ -70,9 +65,6 @@ msgstr ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 
-msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
-msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
-
 msgid "<abbr title=\"Encrypted\">Encr.</abbr>"
 msgstr "<abbr title=\"Encrypted\">加密</abbr>"
 
@@ -82,18 +74,12 @@ msgstr "<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-地址"
 
-msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
-msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-广播"
-
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-网关"
 
 msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"
 msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-子网掩码"
 
-msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
-msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-地址"
-
 msgid ""
 "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address or Network "
 "(CIDR)"
@@ -962,9 +948,6 @@ msgstr "主机名"
 msgid "IP address"
 msgstr "IP地址"
 
-msgid "IP-Aliases"
-msgstr "IP-Aliases"
-
 msgid "IPv4"
 msgstr "IPv4"
 
@@ -1004,9 +987,6 @@ msgstr "IPv6"
 msgid "IPv6 Firewall"
 msgstr "IPv6 Firewall"
 
-msgid "IPv6 Setup"
-msgstr "IPv6设置"
-
 msgid "IPv6 WAN Status"
 msgstr "IPv6 WAN状态"
 
@@ -1525,13 +1505,6 @@ msgstr "Not connected"
 msgid "Note: Configuration files will be erased."
 msgstr "Note: Configuration files will be erased."
 
-msgid ""
-"Note: If you choose an interface here which is part of another network, it "
-"will be moved into this network."
-msgstr ""
-"Note: If you choose an interface here which is part of another network, it "
-"will be moved into this network."
-
 msgid "Notice"
 msgstr "Notice"
 
@@ -1788,37 +1761,26 @@ msgstr ""
 
 msgid ""
 "Really delete this interface? The deletion cannot be undone!\\nYou might "
-"lose access to this router if you are connected via this interface."
+"lose access to this device if you are connected via this interface."
 msgstr ""
-"Really delete this interface? The deletion cannot be undone!\n"
-"You might lose access to this router if you are connected via this "
-"interface."
 
 msgid ""
 "Really delete this wireless network? The deletion cannot be undone!\\nYou "
-"might lose access to this router if you are connected via this network."
+"might lose access to this device if you are connected via this network."
 msgstr ""
-"Really delete this wireless network? The deletion cannot be undone!\n"
-"You might lose access to this router if you are connected via this network."
 
 msgid "Really reset all changes?"
 msgstr "Really reset all changes?"
 
 msgid ""
-"Really shutdown interface \"%s\" ?\\nYou might lose access to this router if "
+"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if "
 "you are connected via this interface."
 msgstr ""
-"Really shutdown interface \"%s\" ?\n"
-"You might lose access to this router if you are connected via this "
-"interface."
 
 msgid ""
-"Really shutdown network ?\\nYou might lose access to this router if you are "
+"Really shutdown network ?\\nYou might lose access to this device if you are "
 "connected via this interface."
 msgstr ""
-"Really shutdown network ?\n"
-"You might lose access to this router if you are connected via this "
-"interface."
 
 msgid "Really switch protocol?"
 msgstr "确定要切换协议？"
@@ -2233,8 +2195,8 @@ msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
 msgstr ""
-"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, "
-"<code>0-9</code> and <code>_</code>"
+"The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
+"code> and <code>_</code>"
 
 msgid ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
@@ -2283,19 +2245,13 @@ msgid "The length of the IPv6 prefix in bits"
 msgstr "The length of the IPv6 prefix in bits"
 
 msgid ""
-"The network ports on your router can be combined to several <abbr title="
+"The network ports on this device can be combined to several <abbr title="
 "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
 "communicate directly with each other. <abbr title=\"Virtual Local Area "
 "Network\">VLAN</abbr>s are often used to separate different network "
 "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 ""
-"The network ports on your router can be combined to several <abbr title="
-"\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
-"communicate directly with each other. <abbr title=\"Virtual Local Area "
-"Network\">VLAN</abbr>s are often used to separate different network "
-"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."
 
 msgid "The selected protocol needs a device assigned"
 msgstr "The selected protocol needs a device assigned"
@@ -2613,6 +2569,12 @@ msgstr ""
 "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP "
 "and ad-hoc mode) to be installed."
 
+msgid "Waiting for changes to be applied..."
+msgstr ""
+
+msgid "Waiting for command to complete..."
+msgstr ""
+
 msgid "Waiting for router..."
 msgstr "Waiting for router..."
 
@@ -2754,6 +2716,83 @@ msgstr "yes"
 msgid "« Back"
 msgstr "« 后退"
 
+#~ msgid ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: "
+#~ "address/prefix"
+#~ msgstr ""
+#~ "<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-标识：地址/前缀"
+
+#~ msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+#~ msgstr "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"
+#~ msgstr "<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-广播"
+
+#~ msgid "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"
+#~ msgstr "<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-地址"
+
+#~ msgid "IP-Aliases"
+#~ msgstr "IP-Aliases"
+
+#~ msgid "IPv6 Setup"
+#~ msgstr "IPv6设置"
+
+#~ msgid ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+#~ msgstr ""
+#~ "Note: If you choose an interface here which is part of another network, "
+#~ "it will be moved into this network."
+
+#~ msgid ""
+#~ "Really delete this interface? The deletion cannot be undone!\\nYou might "
+#~ "lose access to this router if you are connected via this interface."
+#~ msgstr ""
+#~ "Really delete this interface? The deletion cannot be undone!\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "interface."
+
+#~ msgid ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\\nYou "
+#~ "might lose access to this router if you are connected via this network."
+#~ msgstr ""
+#~ "Really delete this wireless network? The deletion cannot be undone!\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "network."
+
+#~ msgid ""
+#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this router "
+#~ "if you are connected via this interface."
+#~ msgstr ""
+#~ "Really shutdown interface \"%s\" ?\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "interface."
+
+#~ msgid ""
+#~ "Really shutdown network ?\\nYou might lose access to this router if you "
+#~ "are connected via this interface."
+#~ msgstr ""
+#~ "Really shutdown network ?\n"
+#~ "You might lose access to this router if you are connected via this "
+#~ "interface."
+
+#~ msgid ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "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 ""
+#~ "The network ports on your router can be combined to several <abbr title="
+#~ "\"Virtual Local Area Network\">VLAN</abbr>s in which computers can "
+#~ "communicate directly with each other. <abbr title=\"Virtual Local Area "
+#~ "Network\">VLAN</abbr>s are often used to separate different network "
+#~ "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."
+
 #~ msgid "Enable buffering"
 #~ msgstr "开启缓冲"