merge in new strings

1 files changed, 112 insertions, 0 deletions

diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index b2c5aaa26..0af229e22 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -776,6 +776,13 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "您的电视信号是什么制式?"
 
+#: Xconfig/xfree.pm:571
+#, c-format
+msgid ""
+"_:weird aspect ratio\n"
+"other"
+msgstr ""
+
 #: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
 #: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
 #: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
@@ -9464,6 +9471,11 @@ msgstr "通用"
 msgid "Any PS/2 & USB mice"
 msgstr "任何 PS/2 或 USB 鼠标"
 
+#: mouse.pm:89
+#, fuzzy, c-format
+msgid "Microsoft Xbox Controller S"
+msgstr "Microsoft Explorer"
+
 #: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
 #, c-format
 msgid "Synaptics Touchpad"
@@ -10457,12 +10469,37 @@ msgstr "开机时启动"
 msgid "DHCP client"
 msgstr "DHCP 客户端"
 
+#: network/netconnect.pm:1041 standalone/drakconnect:389
+#, fuzzy, c-format
+msgid "DHCP timeout (in seconds)"
+msgstr "连接超时(秒)"
+
+#: network/netconnect.pm:1042 standalone/drakconnect:392
+#, fuzzy, c-format
+msgid "Get DNS servers from DHCP"
+msgstr "DNS 服务器 IP"
+
+#: network/netconnect.pm:1043
+#, c-format
+msgid "Get YP server from DHCP"
+msgstr ""
+
+#: network/netconnect.pm:1044
+#, c-format
+msgid "Get NTPD server from DHCP"
+msgstr ""
+
 #: network/netconnect.pm:1037 printer/printerdrake.pm:1605
 #: standalone/drakconnect:649
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
+#: network/netconnect.pm:1057 standalone/drakconnect:686
+#, fuzzy, c-format
+msgid "Netmask address should be in format 255.255.224.0"
+msgstr "网关地址的格式应该是 1.2.3.4"
+
 #: network/netconnect.pm:1041
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
@@ -10536,6 +10573,11 @@ msgstr "比特率(每秒比特数, b/s)"
 
 #: network/netconnect.pm:1141
 #, c-format
+msgid "Use Wi-Fi Protected Access (WPA)"
+msgstr ""
+
+#: network/netconnect.pm:1168
+#, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
@@ -10773,6 +10815,11 @@ msgid "Configuration is complete, do you want to apply settings?"
 msgstr "配置完成, 您想要应用设置吗?"
 
 #: network/netconnect.pm:1336
+#, fuzzy, c-format
+msgid "Do you want to allow users to start the connection?"
+msgstr "您是否希望一开机就启动连接?"
+
+#: network/netconnect.pm:1345
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "您是否希望一开机就启动连接?"
@@ -11030,6 +11077,11 @@ msgstr "一般"
 msgid "maybe"
 msgstr "或许有用"
 
+#: pkgs.pm:474
+#, fuzzy, c-format
+msgid "Downloading file %s..."
+msgstr "正在发送文件..."
+
 #: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
@@ -12136,6 +12188,11 @@ msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "自动探测运行 Microsoft Windows 的机器连接的打印机"
 
 #: printer/printerdrake.pm:1108
+#, fuzzy, c-format
+msgid "No auto-detection"
+msgstr "自动检测"
+
+#: printer/printerdrake.pm:1173
 #, c-format
 msgid ""
 "\n"
@@ -16502,6 +16559,11 @@ msgstr "Mandrakesoft 向导"
 msgid "Wizards to configure server"
 msgstr "服务器配置向导"
 
+#: share/compssUsers.pl.~1.8.~:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "Mandrakesoft 向导"
+
 #: standalone.pm:21
 #, c-format
 msgid ""
@@ -19795,6 +19857,16 @@ msgstr "DHCP"
 
 #: standalone/drakconnect:438
 #, c-format
+msgid "Get YP servers from DHCP"
+msgstr ""
+
+#: standalone/drakconnect:394
+#, c-format
+msgid "Get NTPD servers from DHCP"
+msgstr ""
+
+#: standalone/drakconnect:470
+#, c-format
 msgid "Metric"
 msgstr "度量衡"
 
@@ -23892,6 +23964,11 @@ msgstr "/自动检测调制解调器(_M)"
 msgid "/Autodetect _jaz drives"
 msgstr "/自动检测 jaz 驱动器(_J)"
 
+#: standalone/harddrake2:188
+#, c-format
+msgid "/_Upload the hardware list"
+msgstr ""
+
 #: standalone/harddrake2:188 standalone/printerdrake:140
 #, c-format
 msgid "/_Quit"
@@ -24008,6 +24085,31 @@ msgstr "刻录机"
 msgid "DVD"
 msgstr "DVD"
 
+#: standalone/harddrake2:525
+#, c-format
+msgid "Upload the hardware list"
+msgstr ""
+
+#: standalone/harddrake2:528
+#, fuzzy, c-format
+msgid "Upload the system configuration"
+msgstr "系统配置"
+
+#: standalone/harddrake2:530
+#, fuzzy, c-format
+msgid "Account:"
+msgstr "挂载"
+
+#: standalone/harddrake2:531
+#, fuzzy, c-format
+msgid "Password:"
+msgstr "密码"
+
+#: standalone/harddrake2:532
+#, fuzzy, c-format
+msgid "Hostname:"
+msgstr "主机名: "
+
 #: standalone/keyboarddrake:29
 #, c-format
 msgid "Please, choose your keyboard layout."
@@ -24352,6 +24454,16 @@ msgstr "监视网络"
 msgid "Configure Network"
 msgstr "配置网络"
 
+#: standalone/net_applet:69
+#, fuzzy, c-format
+msgid "Watched interface"
+msgstr "interfaces"
+
+#: standalone/net_applet:78
+#, fuzzy, c-format
+msgid "Profiles"
+msgstr "代理服务器"
+
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/net_applet:61 standalone/printerdrake:238
 #, c-format