i18n: Merge pot changes to po files

1 files changed, 137 insertions, 84 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 88fa6ce..31ab0bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 2007\n"
-"POT-Creation-Date: 2013-10-01 21:39+0100\n"
+"POT-Creation-Date: 2013-11-21 18:54+0000\n"
 "PO-Revision-Date: 2009-04-09 13:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <mageia-i18n@mandrivalinux.org>\n"
@@ -65,8 +65,8 @@ msgstr "局域网配置"
 msgid "Configure Local Area Network..."
 msgstr "配置局域网..."
 
-#: ../bin/drakconnect-old:108 ../bin/draknfs:196 ../bin/net_applet:213
-#: ../lib/network/drakconnect/edit.pm:72
+#: ../bin/drakconnect-old:108 ../bin/draknfs:196 ../bin/net_applet:215
+#: ../bin/net_applet~:215 ../lib/network/drakconnect/edit.pm:72
 #, c-format
 msgid "Help"
 msgstr "帮助"
@@ -172,7 +172,7 @@ msgstr ""
 "这块网卡还没有配置过。\n"
 "请从 Mageia 控制中心运行“%s”助手"
 
-#: ../bin/drakconnect-old:249 ../bin/net_applet:101
+#: ../bin/drakconnect-old:249 ../bin/net_applet:101 ../bin/net_applet~:101
 #: ../lib/network/drakconnect/global.pm:37
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
@@ -630,7 +630,7 @@ msgid "Failed to remove host."
 msgstr "删除主机失败。"
 
 #: ../bin/drakhosts:249 ../bin/drakinvictus:143 ../bin/draknetprofile:226
-#: ../bin/net_applet:217 ../lib/network/drakroam.pm:94
+#: ../bin/net_applet:219 ../bin/net_applet~:219 ../lib/network/drakroam.pm:94
 #: ../lib/network/netcenter.pm:178
 #, c-format
 msgid "Quit"
@@ -643,16 +643,17 @@ msgstr "允许的地址"
 
 #: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:141 ../lib/network/drakfirewall.pm:309
-#: ../lib/network/drakfirewall.pm:313 ../lib/network/net_applet/ifw.pm:62
-#: ../lib/network/net_applet/ifw.pm:90
+#: ../bin/net_applet:141 ../bin/net_applet~:141
+#: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:62 ../lib/network/net_applet/ifw.pm:90
 #, c-format
 msgid "Interactive Firewall"
 msgstr "交互式防火墙"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:62
+#: ../bin/net_applet:355 ../bin/net_applet~:355
+#: ../lib/network/net_applet/ifw.pm:62
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "无法连接守护程序"
@@ -2204,37 +2205,37 @@ msgstr ""
 msgid "DrakSamba manage Samba shares"
 msgstr "DrakSamba 管理 Samba 共享"
 
-#: ../bin/net_applet:92
+#: ../bin/net_applet:92 ../bin/net_applet~:92
 #, c-format
 msgid "Network is up on interface %s."
 msgstr "网卡 %s 的网络已通。"
 
-#: ../bin/net_applet:93
+#: ../bin/net_applet:93 ../bin/net_applet~:93
 #, c-format
 msgid "IP address: %s"
 msgstr "IP 地址: %s"
 
-#: ../bin/net_applet:94
+#: ../bin/net_applet:94 ../bin/net_applet~:94
 #, c-format
 msgid "Gateway: %s"
 msgstr "网关: %s"
 
-#: ../bin/net_applet:95
+#: ../bin/net_applet:95 ../bin/net_applet~:95
 #, c-format
 msgid "DNS: %s"
 msgstr "DNS：%s"
 
-#: ../bin/net_applet:96
+#: ../bin/net_applet:96 ../bin/net_applet~:96
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
 msgstr "已经连接到 %s(连接等级: %d %%)"
 
-#: ../bin/net_applet:98
+#: ../bin/net_applet:98 ../bin/net_applet~:98
 #, c-format
 msgid "Network is down on interface %s."
 msgstr "网卡 %s 的网络已断。"
 
-#: ../bin/net_applet:100
+#: ../bin/net_applet:100 ../bin/net_applet~:100
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
@@ -2243,94 +2244,98 @@ msgstr ""
 "您从未配置过 Internet 连接。\n"
 "请从 Mageia 控制中心运行“%s”助手"
 
-#: ../bin/net_applet:103 ../lib/network/connection_manager.pm:190
+#: ../bin/net_applet:103 ../bin/net_applet~:103
+#: ../lib/network/connection_manager.pm:190
 #, c-format
 msgid "Connecting..."
 msgstr "正在连接..."
 
-#: ../bin/net_applet:129 ../bin/net_monitor:519
+#: ../bin/net_applet:129 ../bin/net_applet~:129 ../bin/net_monitor:519
 #, c-format
 msgid "Connect %s"
 msgstr "连接 %s"
 
-#: ../bin/net_applet:133 ../bin/net_monitor:519
+#: ../bin/net_applet:133 ../bin/net_applet~:133 ../bin/net_monitor:519
 #, c-format
 msgid "Disconnect %s"
 msgstr "断开 %s"
 
-#: ../bin/net_applet:137
+#: ../bin/net_applet:137 ../bin/net_applet~:137
 #, c-format
 msgid "Monitor Network"
 msgstr "监视网络"
 
-#: ../bin/net_applet:145
+#: ../bin/net_applet:145 ../bin/net_applet~:145
 #, c-format
 msgid "Manage wireless networks"
 msgstr "管理无线网络"
 
-#: ../bin/net_applet:149
+#: ../bin/net_applet:149 ../bin/net_applet~:149
 #, c-format
 msgid "Manage VPN connections"
 msgstr "管理 VPN 连接"
 
-#: ../bin/net_applet:153
+#: ../bin/net_applet:153 ../bin/net_applet~:153
 #, c-format
 msgid "Configure Network"
 msgstr "配置网络"
 
-#: ../bin/net_applet:157
+#: ../bin/net_applet:157 ../bin/net_applet~:157
 #, c-format
 msgid "Watched interface"
 msgstr "监视的接口"
 
 #: ../bin/net_applet:158 ../bin/net_applet:161 ../bin/net_applet:164
+#: ../bin/net_applet~:158 ../bin/net_applet~:161 ../bin/net_applet~:164
 #, c-format
 msgid "Auto-detect"
 msgstr "自动检测"
 
-#: ../bin/net_applet:169
+#: ../bin/net_applet:169 ../bin/net_applet~:169
 #, c-format
 msgid "Active interfaces"
 msgstr "活动接口"
 
-#: ../bin/net_applet:189
+#: ../bin/net_applet:189 ../bin/net_applet~:189
 #, c-format
 msgid "Profiles"
 msgstr "配置文件"
 
-#: ../bin/net_applet:199 ../lib/network/connection.pm:236
-#: ../lib/network/drakvpn.pm:65 ../lib/network/vpn/openvpn.pm:368
-#: ../lib/network/vpn/openvpn.pm:382 ../lib/network/vpn/openvpn.pm:393
+#: ../bin/net_applet:201 ../bin/net_applet~:201
+#: ../lib/network/connection.pm:236 ../lib/network/drakvpn.pm:65
+#: ../lib/network/vpn/openvpn.pm:368 ../lib/network/vpn/openvpn.pm:382
+#: ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "VPN connection"
 msgstr "VPN 连接"
 
-#: ../bin/net_applet:353 ../bin/net_applet:558
+#: ../bin/net_applet:355 ../bin/net_applet:560 ../bin/net_applet~:355
+#: ../bin/net_applet~:560
 #, c-format
 msgid "Wireless networks"
 msgstr "无线网络"
 
-#: ../bin/net_applet:434
+#: ../bin/net_applet:436 ../bin/net_applet~:436
 #, c-format
 msgid "Network connection"
 msgstr "网络连接"
 
-#: ../bin/net_applet:521
+#: ../bin/net_applet:523 ../bin/net_applet~:523
 #, c-format
 msgid "More networks"
 msgstr "更多网络"
 
-#: ../bin/net_applet:548
+#: ../bin/net_applet:550 ../bin/net_applet~:550
 #, c-format
 msgid "Interactive Firewall automatic mode"
 msgstr "交互式防火墙自动模式"
 
-#: ../bin/net_applet:553
+#: ../bin/net_applet:555 ../bin/net_applet~:555
 #, c-format
 msgid "Always launch on startup"
 msgstr "启动时自动调用"
 
-#: ../bin/net_applet:565 ../bin/net_monitor:96
+#: ../bin/net_applet:567 ../bin/net_applet~:567 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
 msgstr "设置"
@@ -5265,7 +5270,7 @@ msgid "Which services would you like to allow the Internet to connect to?"
 msgstr "您想要本机上开放哪些服务?"
 
 #: ../lib/network/drakfirewall.pm:265 ../lib/network/netconnect.pm:128
-#: ../lib/network/network.pm:553
+#: ../lib/network/network.pm:551
 #, c-format
 msgid "Those settings will be saved for the network profile <b>%s</b>"
 msgstr "这些设置将会保存在网络配置文件 <b>%s</b> 中"
@@ -6227,12 +6232,12 @@ msgstr ""
 "发生了意外错误: \n"
 "%s"
 
-#: ../lib/network/network.pm:527
+#: ../lib/network/network.pm:525
 #, c-format
 msgid "Advanced network settings"
 msgstr "高级网络设置"
 
-#: ../lib/network/network.pm:528
+#: ../lib/network/network.pm:526
 #, c-format
 msgid ""
 "Here you can configure advanced network settings. Please note that you have "
@@ -6240,104 +6245,104 @@ msgid ""
 msgstr ""
 "您可以在此配置高级网络设置。请注意，您需要重新启动计算机才能让更改生效。"
 
-#: ../lib/network/network.pm:530
+#: ../lib/network/network.pm:528
 #, c-format
 msgid "Wireless regulatory domain"
 msgstr "无线受限域"
 
-#: ../lib/network/network.pm:531
+#: ../lib/network/network.pm:529
 #, c-format
 msgid "TCP/IP settings"
 msgstr "TCP/IP 设置"
 
-#: ../lib/network/network.pm:532
+#: ../lib/network/network.pm:530
 #, c-format
 msgid "Disable IPv6"
 msgstr "禁用 Ipv6"
 
-#: ../lib/network/network.pm:533
+#: ../lib/network/network.pm:531
 #, c-format
 msgid "Disable TCP Window Scaling"
 msgstr "禁用 TCP 窗口范围"
 
-#: ../lib/network/network.pm:534
+#: ../lib/network/network.pm:532
 #, c-format
 msgid "Disable TCP Timestamps"
 msgstr "禁用 TCP 时间戳"
 
-#: ../lib/network/network.pm:535
+#: ../lib/network/network.pm:533
 #, c-format
 msgid "Security settings (defined by MSEC policy)"
 msgstr "安全设置(由 MSEC 策略定义)"
 
-#: ../lib/network/network.pm:536
+#: ../lib/network/network.pm:534
 #, c-format
 msgid "Disable ICMP echo"
 msgstr "禁用 ICMP 响应"
 
-#: ../lib/network/network.pm:537
+#: ../lib/network/network.pm:535
 #, c-format
 msgid "Disable ICMP echo for broadcasting messages"
 msgstr "禁用广播消息的 ICMP 响应"
 
-#: ../lib/network/network.pm:538
+#: ../lib/network/network.pm:536
 #, c-format
 msgid "Disable invalid ICMP error responses"
 msgstr "禁用无效的 ICMP 错误响应"
 
-#: ../lib/network/network.pm:539
+#: ../lib/network/network.pm:537
 #, c-format
 msgid "Log strange packets"
 msgstr "记录奇怪的数据包"
 
-#: ../lib/network/network.pm:552
+#: ../lib/network/network.pm:550
 #, c-format
 msgid "Proxies configuration"
 msgstr "代理服务器配置"
 
-#: ../lib/network/network.pm:553
+#: ../lib/network/network.pm:551
 #, c-format
 msgid ""
 "Here you can set up your proxies configuration (eg: http://"
 "my_caching_server:8080)"
 msgstr "您可以在此处设定您的代理服务器配置(如: http://my_caching_server:8080)"
 
-#: ../lib/network/network.pm:554
+#: ../lib/network/network.pm:552
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP 代理服务器"
 
-#: ../lib/network/network.pm:555
+#: ../lib/network/network.pm:553
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
 msgstr "HTTPS 连接也使用 HTTP 代理"
 
-#: ../lib/network/network.pm:556
+#: ../lib/network/network.pm:554
 #, c-format
 msgid "HTTPS proxy"
 msgstr "HTTPS 代理服务器"
 
-#: ../lib/network/network.pm:557
+#: ../lib/network/network.pm:555
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP 代理服务器"
 
-#: ../lib/network/network.pm:558
+#: ../lib/network/network.pm:556
 #, c-format
 msgid "No proxy for (comma separated list):"
 msgstr "以下地址不使用代理(用逗号分隔):"
 
-#: ../lib/network/network.pm:563
+#: ../lib/network/network.pm:561
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "代理服务器应该是 http://..."
 
-#: ../lib/network/network.pm:564
+#: ../lib/network/network.pm:562
 #, c-format
 msgid "Proxy should be http://... or https://..."
 msgstr "代理应该是 http://... 或 https://..."
 
-#: ../lib/network/network.pm:565
+#: ../lib/network/network.pm:563
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URL 应该是以“ftp:”或“http:”开头"
@@ -6620,117 +6625,165 @@ msgstr "NAT 模式"
 msgid "Use specific UDP port"
 msgstr "使用指定的 UDP 端口"
 
-#: ../polkit/policy/org.mageia.drakconnect.policy.in.h:1
+#: ../polkit/com.redhat.initscripts.ifdown.policy.in.h:1
+#, fuzzy
+msgid "Take Network Interface Down"
+msgstr "网卡"
+
+#: ../polkit/com.redhat.initscripts.ifdown.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required to take down a network interface"
+msgstr "连接配置"
+
+#: ../polkit/com.redhat.initscripts.ifup.policy.in.h:1
+#, fuzzy
+msgid "Bring Network Interface Up"
+msgstr "网卡"
+
+#: ../polkit/com.redhat.initscripts.ifup.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required to bring up a network interface"
+msgstr "连接配置"
+
+#: ../polkit/com.redhat.initscripts.vpn-start.policy.in.h:1
+msgid "Start Virtual Private Network"
+msgstr ""
+
+#: ../polkit/com.redhat.initscripts.vpn-start.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required start the Virtual Private Network"
+msgstr "连接配置"
+
+#: ../polkit/com.redhat.initscripts.vpn-stop.policy.in.h:1
+msgid "Stop Virtual Private Network"
+msgstr ""
+
+#: ../polkit/com.redhat.initscripts.vpn-stop.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required stop the Virtual Private Network"
+msgstr "连接配置"
+
+#: ../polkit/org.mageia.drakconnect.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Network Connection Configuration"
 msgstr "连接配置"
 
-#: ../polkit/policy/org.mageia.drakconnect.policy.in.h:2
+#: ../polkit/org.mageia.drakconnect.policy.in.h:2
 #, fuzzy
 msgid ""
 "Authentication is required to run Mageia Network Connection Configuration"
 msgstr "连接配置"
 
-#: ../polkit/policy/org.mageia.drakfirewall.policy.in.h:1
-#: ../polkit/policy/org.mageia.drakinvictus.policy.in.h:1
+#: ../polkit/org.mageia.drakfirewall.policy.in.h:1
+#: ../polkit/org.mageia.drakinvictus.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Firewall Configuration"
 msgstr "防火墙配置"
 
-#: ../polkit/policy/org.mageia.drakfirewall.policy.in.h:2
-#: ../polkit/policy/org.mageia.drakinvictus.policy.in.h:2
+#: ../polkit/org.mageia.drakfirewall.policy.in.h:2
+#: ../polkit/org.mageia.drakinvictus.policy.in.h:2
 msgid "Authentication is required to run Mageia Firewall Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakgw.policy.in.h:1
+#: ../polkit/org.mageia.drakgw.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Internet Sharing Configuration"
 msgstr "连接配置"
 
-#: ../polkit/policy/org.mageia.drakgw.policy.in.h:2
+#: ../polkit/org.mageia.drakgw.policy.in.h:2
 msgid "Authentication is required to run Mageia Internet Sharing Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakhosts.policy.in.h:1
+#: ../polkit/org.mageia.drakhosts.policy.in.h:1
 msgid "Run Mageia Local Host Names Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakhosts.policy.in.h:2
+#: ../polkit/org.mageia.drakhosts.policy.in.h:2
 msgid "Authentication is required to run Mageia Local Host Names Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakids.policy.in.h:1
+#: ../polkit/org.mageia.drakids.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia IDS Configuration"
 msgstr "管理 Samba 配置"
 
-#: ../polkit/policy/org.mageia.drakids.policy.in.h:2
+#: ../polkit/org.mageia.drakids.policy.in.h:2
 msgid "Authentication is required to run Mageia IDS Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.draknetcenter.policy.in.h:1
+#: ../polkit/org.mageia.draknetcenter.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Network Center"
 msgstr "网络中心"
 
-#: ../polkit/policy/org.mageia.draknetcenter.policy.in.h:2
+#: ../polkit/org.mageia.draknetcenter.policy.in.h:2
 msgid "Authentication is required to run Mageia Network Center"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.draknetprofile.policy.in.h:1
+#: ../polkit/org.mageia.draknetprofile.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Network Profile Configuration"
 msgstr "网络配置"
 
-#: ../polkit/policy/org.mageia.draknetprofile.policy.in.h:2
+#: ../polkit/org.mageia.draknetprofile.policy.in.h:2
 msgid "Authentication is required to run Mageia Network Profile Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.draknfs.policy.in.h:1
+#: ../polkit/org.mageia.draknfs.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia NFS Shares Configuration"
 msgstr "管理 Samba 配置"
 
-#: ../polkit/policy/org.mageia.draknfs.policy.in.h:2
+#: ../polkit/org.mageia.draknfs.policy.in.h:2
 msgid "Authentication is required to run Mageia NFS Shares Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakproxy.policy.in.h:1
+#: ../polkit/org.mageia.drakproxy.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Proxy Configuration"
 msgstr "连接配置"
 
-#: ../polkit/policy/org.mageia.drakproxy.policy.in.h:2
+#: ../polkit/org.mageia.drakproxy.policy.in.h:2
 msgid "Authentication is required to run Mageia Proxy Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakroam.policy.in.h:1
+#: ../polkit/org.mageia.drakroam.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia WiFi Configuration"
 msgstr "管理 Samba 配置"
 
-#: ../polkit/policy/org.mageia.drakroam.policy.in.h:2
+#: ../polkit/org.mageia.drakroam.policy.in.h:2
 msgid "Authentication is required to run Mageia WiFi Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.draksambashare.policy.in.h:1
+#: ../polkit/org.mageia.draksambashare.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia Samba Shares Configuration"
 msgstr "管理 Samba 配置"
 
-#: ../polkit/policy/org.mageia.draksambashare.policy.in.h:2
+#: ../polkit/org.mageia.draksambashare.policy.in.h:2
 msgid "Authentication is required to run Mageia Samba Shares Configuration"
 msgstr ""
 
-#: ../polkit/policy/org.mageia.drakvpn.policy.in.h:1
+#: ../polkit/org.mageia.drakvpn.policy.in.h:1
 #, fuzzy
 msgid "Run Mageia VPN Configuration"
 msgstr "VPN 配置"
 
-#: ../polkit/policy/org.mageia.drakvpn.policy.in.h:2
+#: ../polkit/org.mageia.drakvpn.policy.in.h:2
 msgid "Authentication is required to run Mageia VPN Configuration"
 msgstr ""
 
+#: ../polkit/org.mageia-x.set-netprofile.policy.in.h:1
+#, fuzzy
+msgid "Set Network Profile"
+msgstr "网络配置文件"
+
+#: ../polkit/org.mageia-x.set-netprofile.policy.in.h:2
+#, fuzzy
+msgid "Authentication is required to set the network profile"
+msgstr "连接配置"
+
 #~ msgid "Same IP is already in %s file."
 #~ msgstr "%s 文件中已经有同样的 IP 了。"