sync with code

1 files changed, 123 insertions, 118 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index b0931b1f9..3ac204b5c 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"POT-Creation-Date: 2016-01-02 14:54+0100\n"
 "PO-Revision-Date: 2015-02-13 05:25+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
@@ -94,169 +94,164 @@ msgstr ""
 
 #: any.pm:162
 #, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: any.pm:163
-#, c-format
 msgid "Network (HTTP)"
 msgstr "网络 (HTTP)"
 
-#: any.pm:164
+#: any.pm:163
 #, c-format
 msgid "Network (FTP)"
 msgstr "网络 (FTP)"
 
-#: any.pm:165
+#: any.pm:164
 #, c-format
 msgid "Network (NFS)"
 msgstr "网络 (NFS)"
 
-#: any.pm:224
+#: any.pm:223
 #, c-format
 msgid "URL of the mirror?"
 msgstr "镜像的 URL?"
 
-#: any.pm:230
+#: any.pm:229
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL 必须以 ftp:// 或 http:// 开始"
 
-#: any.pm:248
+#: any.pm:247
 #, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "正在连接 %s 网站获得可用镜像的列表..."
 
-#: any.pm:253
+#: any.pm:252
 #, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "连接 %s 网站以获得可用镜像的列表失败"
 
-#: any.pm:263
+#: any.pm:262
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "选择一个镜像网站来取得软件包"
 
-#: any.pm:293
+#: any.pm:290
 #, c-format
 msgid "NFS setup"
 msgstr "NFS 设置"
 
-#: any.pm:294
+#: any.pm:291
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "请输入您 NFS 介质的主机名和目录"
 
-#: any.pm:298
+#: any.pm:295
 #, c-format
 msgid "Hostname missing"
 msgstr "缺少主机名"
 
-#: any.pm:299
+#: any.pm:296
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "目录必须以“/”开头"
 
-#: any.pm:303
+#: any.pm:300
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS 挂载的主机名？"
 
-#: any.pm:304
+#: any.pm:301
 #, c-format
 msgid "Directory"
 msgstr "目录"
 
-#: any.pm:334
+#: any.pm:331
 #, c-format
 msgid "Supplementary"
 msgstr "赠品"
 
-#: any.pm:369
+#: any.pm:366
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "无法在此镜像上找到软件包列表文件。请确定位置正确。"
 
-#: any.pm:394
+#: any.pm:391
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:396
+#: any.pm:393
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:398
+#: any.pm:395
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:436
+#: any.pm:433
 #, c-format
 msgid ""
 "Some hardware on your machine needs some non free firmwares in order for the "
 "free software drivers to work."
 msgstr ""
 
-#: any.pm:437
+#: any.pm:434
 #, c-format
 msgid "You should enable \"%s\""
 msgstr ""
 
-#: any.pm:475
+#: any.pm:472
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr ""
 
-#: any.pm:476
+#: any.pm:473
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr "\"%s\" 包含非自由软件。\n"
 
-#: any.pm:477
+#: any.pm:474
 #, c-format
 msgid ""
 "It also contains firmwares needed for certain devices to operate (eg: some "
 "ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
 msgstr ""
 
-#: any.pm:478
+#: any.pm:475
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr ""
 
-#: any.pm:479
+#: any.pm:476
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr ""
 
-#: any.pm:485
+#: any.pm:482
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr ""
 
-#: any.pm:502
+#: any.pm:499
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr ""
 
-#: any.pm:600
+#: any.pm:597
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查找已经安装过的软件包..."
 
-#: any.pm:634
+#: any.pm:631
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在寻找可升级的程序..."
 
-#: any.pm:653
+#: any.pm:650
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "正在删除由于更新所致的软件包..."
@@ -305,7 +300,7 @@ msgstr "FTP"
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1382 steps_interactive.pm:948
+#: any.pm:1382 steps_interactive.pm:973
 #, c-format
 msgid "Network"
 msgstr "网络"
@@ -355,7 +350,7 @@ msgstr "安装"
 msgid "Configuration"
 msgstr "配置"
 
-#: install2.pm:210
+#: install2.pm:211
 #, c-format
 msgid "You must also format %s"
 msgstr "您还必须格式化 %s"
@@ -379,22 +374,22 @@ msgstr "正在启动网络"
 msgid "Bringing down the network"
 msgstr "正在禁用网络"
 
-#: media.pm:404
+#: media.pm:407
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "请稍候，正在获取文件"
 
-#: media.pm:712
+#: media.pm:714
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
 
-#: media.pm:752
+#: media.pm:754
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在将软件包复制到磁盘中以备后用"
 
-#: media.pm:805
+#: media.pm:807
 #, c-format
 msgid "Copying in progress"
 msgstr "复制进行中"
@@ -439,7 +434,7 @@ msgstr "未找到介质“%s”的 XML 信息，只返回软件包 %s 的部分�
 msgid "No description"
 msgstr "无描述"
 
-#: pkgs.pm:286
+#: pkgs.pm:288
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -448,27 +443,27 @@ msgstr ""
 "%s 所请求的某些软件包无法安装:\n"
 "%s"
 
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:384 pkgs.pm:411
 #, c-format
 msgid "An error occurred:"
 msgstr "发生了一个错误:"
 
-#: pkgs.pm:401
+#: pkgs.pm:403
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: pkgs.pm:895 pkgs.pm:937
+#: pkgs.pm:897 pkgs.pm:939
 #, c-format
 msgid "Do not ask again"
 msgstr "不要再次询问"
 
-#: pkgs.pm:911
+#: pkgs.pm:913
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: pkgs.pm:912
+#: pkgs.pm:914
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安装软件包失败:"
@@ -549,33 +544,33 @@ msgstr "控制台工具"
 msgid "Editors, shells, file tools, terminals"
 msgstr "编辑器, shell, 文件工具, 终端"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
-#: share/meta-task/compssUsers.pl:208
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:203
 #, c-format
 msgid "Development"
 msgstr "开发"
 
-#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:204
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C 和 C++ 开发库, 程序及头文件"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:213
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Documentation"
 msgstr "文档"
 
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:209
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "有关 Linux 和自由软件的书籍和指南"
 
-#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:217
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:212
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base。第三方应用程序支持"
@@ -706,9 +701,9 @@ msgid "Graphical Environment"
 msgstr "图形环境"
 
 #: share/meta-task/compssUsers.pl:152
-#, c-format
-msgid "KDE Workstation"
-msgstr "KDE 工作站"
+#, fuzzy, c-format
+msgid "Plasma Workstation"
+msgstr "工作站"
 
 #: share/meta-task/compssUsers.pl:153
 #, c-format
@@ -788,62 +783,50 @@ msgstr "一种轻量级的快速图形环境"
 
 #: share/meta-task/compssUsers.pl:194
 #, c-format
-msgid "Plasma Desktop"
-msgstr "Plasma 桌面"
-
-#: share/meta-task/compssUsers.pl:195
-#, c-format
-msgid ""
-"The Plasma Desktop, the basic graphical environment with a collection of "
-"accompanying tools"
-msgstr ""
-
-#: share/meta-task/compssUsers.pl:199
-#, c-format
 msgid "Other Graphical Desktops"
 msgstr "其它图形桌面"
 
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid "Window Maker, Fvwm, etc"
 msgstr "Window Maker, Fvwm, 等等"
 
-#: share/meta-task/compssUsers.pl:223
+#: share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Utilities"
 msgstr "工具"
 
-#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#: share/meta-task/compssUsers.pl:220 share/meta-task/compssUsers.pl:221
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 服务器"
 
-#: share/meta-task/compssUsers.pl:230
+#: share/meta-task/compssUsers.pl:225
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:231
+#: share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin 远程配置服务器"
 
-#: share/meta-task/compssUsers.pl:235
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "网络工具/监视"
 
-#: share/meta-task/compssUsers.pl:236
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "监视工具、进程统计、tcpdump、nmap……"
 
-#: share/meta-task/compssUsers.pl:240
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia 向导"
 
-#: share/meta-task/compssUsers.pl:241
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Wizards to configure server"
 msgstr "服务器配置向导"
@@ -857,7 +840,7 @@ msgstr ""
 "发生错误, 可是我不知道该怎样处理才好。\n"
 "继续下去会怎样就看您的运气了。"
 
-#: steps.pm:458
+#: steps.pm:460
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -900,7 +883,7 @@ msgstr ""
 "如果您真的遇到问题的话，可以试试文本安装。要进入文本安装，请在启动时按“F1”，"
 "然后输入“text”。"
 
-#: steps_gtk.pm:242 steps_gtk.pm:757
+#: steps_gtk.pm:242 steps_gtk.pm:754
 #, c-format
 msgid "Media Selection"
 msgstr "介质选择"
@@ -1097,28 +1080,28 @@ msgstr "剩余时间:"
 msgid "(estimating...)"
 msgstr "(正在估计...)"
 
-#: steps_gtk.pm:631
+#: steps_gtk.pm:627
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 个软件包"
 
-#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
+#: steps_gtk.pm:684 steps_interactive.pm:834 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "摘要"
 
-#: steps_gtk.pm:706
+#: steps_gtk.pm:703
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#: steps_gtk.pm:720 steps_interactive.pm:830 steps_interactive.pm:986
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: steps_gtk.pm:766 steps_interactive.pm:315
+#: steps_gtk.pm:763 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1127,7 +1110,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: steps_gtk.pm:782 steps_interactive.pm:321
+#: steps_gtk.pm:779 steps_interactive.pm:321
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1139,7 +1122,7 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: steps_gtk.pm:784 steps_interactive.pm:323
+#: steps_gtk.pm:781 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"
@@ -1220,12 +1203,12 @@ msgstr ""
 
 #: steps_interactive.pm:264
 #, c-format
-msgid "IDE"
-msgstr "IDE"
+msgid "CD/DVD"
+msgstr ""
 
 #: steps_interactive.pm:264
-#, c-format
-msgid "Configuring IDE"
+#, fuzzy, c-format
+msgid "Configuring CD/DVD"
 msgstr "配置 IDE"
 
 #: steps_interactive.pm:354
@@ -1394,7 +1377,7 @@ msgstr "安装后的配置"
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "请确定更新模块介质位于驱动器 %s"
 
-#: steps_interactive.pm:739 steps_list.pm:47
+#: steps_interactive.pm:739 steps_interactive.pm:769 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
@@ -1418,7 +1401,17 @@ msgid ""
 "Do you want to setup the update media?"
 msgstr ""
 
-#: steps_interactive.pm:764
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Failure when adding medium"
+msgstr "无法添加介质"
+
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Retry?"
+msgstr "重试"
+
+#: steps_interactive.pm:770
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1438,113 +1431,113 @@ msgstr ""
 "您是否要安装升级包?"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:853
+#: steps_interactive.pm:878
 #, c-format
 msgid "%s on %s"
 msgstr "位于 %2$s 上的 %1$s"
 
-#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
-#: steps_interactive.pm:925 steps_interactive.pm:940
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: steps_interactive.pm:909 steps_interactive.pm:926
+#: steps_interactive.pm:934 steps_interactive.pm:951
 #, c-format
 msgid "Sound card"
 msgstr "声卡"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:954
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 声卡吗?"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:956
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
 
-#: steps_interactive.pm:933
+#: steps_interactive.pm:958
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
 
-#: steps_interactive.pm:941
+#: steps_interactive.pm:966
 #, c-format
 msgid "Graphical interface"
 msgstr "图形界面"
 
-#: steps_interactive.pm:947 steps_interactive.pm:959
+#: steps_interactive.pm:972 steps_interactive.pm:984
 #, c-format
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:985
 #, c-format
 msgid "Proxies"
 msgstr "代理服务器"
 
-#: steps_interactive.pm:961
+#: steps_interactive.pm:986
 #, c-format
 msgid "configured"
 msgstr "已配置"
 
-#: steps_interactive.pm:971
+#: steps_interactive.pm:996
 #, c-format
 msgid "Security Level"
 msgstr "安全级别"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:1016
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "activated"
 msgstr "已激活"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "disabled"
 msgstr "已禁用"
 
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1034
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有配置过 X。您真的想要这样吗?"
 
 #. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1065
 #, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在准备安装初始安装程序..."
 
-#: steps_interactive.pm:1041
+#: steps_interactive.pm:1066
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "请稍候，这可能需要一会儿..."
 
-#: steps_interactive.pm:1057
+#: steps_interactive.pm:1082
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr "在此安全级别中, 只有管理员才能访问 Windows 分区中的文件。"
 
-#: steps_interactive.pm:1089
+#: steps_interactive.pm:1114
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中插入一张空白软盘"
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1116
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: steps_interactive.pm:1102
+#: steps_interactive.pm:1127
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1555,12 +1548,12 @@ msgstr ""
 "\n"
 "您真的要现在退出吗?"
 
-#: steps_interactive.pm:1112
+#: steps_interactive.pm:1137
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: steps_interactive.pm:1115
+#: steps_interactive.pm:1140
 #, c-format
 msgid "Reboot"
 msgstr "重新启动"
@@ -1697,5 +1690,17 @@ msgid ""
 "Exit"
 msgstr "退出"
 
+#~ msgid "CD-ROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "KDE Workstation"
+#~ msgstr "KDE 工作站"
+
+#~ msgid "Plasma Desktop"
+#~ msgstr "Plasma 桌面"
+
+#~ msgid "IDE"
+#~ msgstr "IDE"
+
 #~ msgid "Preparing bootloader..."
 #~ msgstr "正在准备引导程序..."