sync with code

1 files changed, 75 insertions, 65 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 5fbd3c0c6..cd9fc633f 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 2008 Spring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-02 10:44+0300\n"
+"POT-Creation-Date: 2012-07-26 16:50+0200\n"
 "PO-Revision-Date: 2009-04-09 11:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -159,23 +159,28 @@ msgid ""
 "correct."
 msgstr "无法在此镜像上找到软件包列表文件。请确定位置正确。"
 
-#: any.pm:335
+#: any.pm:338 pkgs.pm:381
+#, c-format
+msgid "An error occurred:"
+msgstr "发生了一个错误:"
+
+#: any.pm:349
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "正在查找已经安装过的软件包..."
 
-#: any.pm:370
+#: any.pm:383
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "正在寻找可升级的程序..."
 
-#: any.pm:388
+#: any.pm:396
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "正在删除由于更新所致的软件包..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:603
+#: any.pm:611
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,72 +193,72 @@ msgstr ""
 "\n"
 "您确定要删除这些软件包吗?\n"
 
-#: any.pm:822
+#: any.pm:830
 #, c-format
 msgid "Error reading file %s"
 msgstr "请取文件 %s 出错"
 
-#: any.pm:1030
+#: any.pm:1038
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列盘片已重命名:"
 
-#: any.pm:1032
+#: any.pm:1040
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s(以前的名称为 %s)"
 
-#: any.pm:1089
+#: any.pm:1097
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1089
+#: any.pm:1097
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1089
+#: any.pm:1097
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1108 steps_interactive.pm:961
+#: any.pm:1116 steps_interactive.pm:961
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: any.pm:1112
+#: any.pm:1120
 #, c-format
 msgid "Please choose a media"
 msgstr "请选择介质"
 
-#: any.pm:1128
+#: any.pm:1136
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "文件已经存在。覆盖吗?"
 
-#: any.pm:1132
+#: any.pm:1140
 #, c-format
 msgid "Permission denied"
 msgstr "没有权限"
 
-#: any.pm:1180
+#: any.pm:1188
 #, c-format
 msgid "Bad NFS name"
 msgstr "无效的 NFS 名称"
 
-#: any.pm:1201
+#: any.pm:1209
 #, c-format
 msgid "Bad media %s"
 msgstr "无效的介质 %s"
 
-#: any.pm:1245
+#: any.pm:1253
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "无法在分区完成之前进行屏幕捕捉"
 
-#: any.pm:1253
+#: any.pm:1261
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
@@ -263,7 +268,7 @@ msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
 msgid "Installation"
 msgstr "安装"
 
-#: gtk.pm:135 share/meta-task/compssUsers.pl:43
+#: gtk.pm:135
 #, c-format
 msgid "Configuration"
 msgstr "配置"
@@ -351,22 +356,17 @@ msgstr ""
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误: %s。"
 
-#: pkgs.pm:381
-#, c-format
-msgid "An error occurred:"
-msgstr "发生了一个错误:"
-
-#: pkgs.pm:858 pkgs.pm:895
+#: pkgs.pm:859 pkgs.pm:896
 #, c-format
 msgid "Do not ask again"
 msgstr "不要再次询问"
 
-#: pkgs.pm:874
+#: pkgs.pm:875
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: pkgs.pm:875
+#: pkgs.pm:876
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安装软件包失败:"
@@ -786,180 +786,190 @@ msgstr "单击图像可查看更大的预览"
 msgid "Package Group Selection"
 msgstr "程序组选择"
 
-#: steps_gtk.pm:340 steps_interactive.pm:647
+#: steps_gtk.pm:344 steps_interactive.pm:647
 #, c-format
 msgid "Individual package selection"
 msgstr "选择单个软件包"
 
-#: steps_gtk.pm:364 steps_interactive.pm:562
+#: steps_gtk.pm:351
+#, c-format
+msgid "Select All"
+msgstr ""
+
+#: steps_gtk.pm:352
+#, c-format
+msgid "Unselect All"
+msgstr ""
+
+#: steps_gtk.pm:371 steps_interactive.pm:562
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "总共大小: %d / %d MB"
 
-#: steps_gtk.pm:409
+#: steps_gtk.pm:416
 #, c-format
 msgid "Version: "
 msgstr "版本: "
 
-#: steps_gtk.pm:410
+#: steps_gtk.pm:417
 #, c-format
 msgid "Size: "
 msgstr "大小: "
 
-#: steps_gtk.pm:410
+#: steps_gtk.pm:417
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:411
+#: steps_gtk.pm:418
 #, c-format
 msgid "Importance: "
 msgstr "重要程度: "
 
-#: steps_gtk.pm:412
+#: steps_gtk.pm:419
 #, c-format
 msgid "No description"
 msgstr "无描述"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:453
 #, c-format
 msgid "You cannot select/unselect this package"
 msgstr "您不能改变这个软件包的选定"
 
-#: steps_gtk.pm:450
+#: steps_gtk.pm:457
 #, c-format
 msgid "due to missing %s"
 msgstr "由于缺少 %s"
 
-#: steps_gtk.pm:451
+#: steps_gtk.pm:458
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由于不满足的 %s"
 
-#: steps_gtk.pm:452
+#: steps_gtk.pm:459
 #, c-format
 msgid "trying to promote %s"
 msgstr "尝试推广 %s"
 
-#: steps_gtk.pm:453
+#: steps_gtk.pm:460
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: steps_gtk.pm:458
+#: steps_gtk.pm:465
 #, c-format
 msgid ""
 "You cannot select this package as there is not enough space left to install "
 "it"
 msgstr "您不可以选择这个软件包。没有足够空间安装它。"
 
-#: steps_gtk.pm:461
+#: steps_gtk.pm:468
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "即将安装下列软件包"
 
-#: steps_gtk.pm:462
+#: steps_gtk.pm:469
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "即将卸载下列软件包"
 
-#: steps_gtk.pm:488
+#: steps_gtk.pm:495
 #, c-format
 msgid "This is a mandatory package, it cannot be unselected"
 msgstr "这个软件包是必需的, 不能取消选定"
 
-#: steps_gtk.pm:490
+#: steps_gtk.pm:497
 #, c-format
 msgid "You cannot unselect this package. It is already installed"
 msgstr "您不可以取消选择这个软件包。它已经安装过了"
 
-#: steps_gtk.pm:492
+#: steps_gtk.pm:499
 #, c-format
 msgid "You cannot unselect this package. It must be upgraded"
 msgstr "您不能不选择这个软件包。它必须升级"
 
-#: steps_gtk.pm:496
+#: steps_gtk.pm:503
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:510
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: steps_gtk.pm:506
+#: steps_gtk.pm:513
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/保存选择"
 
-#: steps_gtk.pm:507
+#: steps_gtk.pm:514
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:519
 #, c-format
 msgid "Minimal install"
 msgstr "最小安装"
 
-#: steps_gtk.pm:525
+#: steps_gtk.pm:532
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
 
-#: steps_gtk.pm:525 steps_interactive.pm:443
+#: steps_gtk.pm:532 steps_interactive.pm:443
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想要安装的软件包"
 
-#: steps_gtk.pm:542 steps_interactive.pm:661 steps_list.pm:32
+#: steps_gtk.pm:549 steps_interactive.pm:661 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "安装"
 
-#: steps_gtk.pm:572
+#: steps_gtk.pm:579
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: steps_gtk.pm:591
+#: steps_gtk.pm:598
 #, c-format
 msgid "Time remaining:"
 msgstr "剩余时间:"
 
-#: steps_gtk.pm:592
+#: steps_gtk.pm:599
 #, c-format
 msgid "(estimating...)"
 msgstr "(正在估计...)"
 
-#: steps_gtk.pm:622
+#: steps_gtk.pm:629
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 个软件包"
 
-#: steps_gtk.pm:677 steps_interactive.pm:825 steps_list.pm:43
+#: steps_gtk.pm:684 steps_interactive.pm:825 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "摘要"
 
-#: steps_gtk.pm:696
+#: steps_gtk.pm:703
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: steps_gtk.pm:713 steps_interactive.pm:821 steps_interactive.pm:973
+#: steps_gtk.pm:720 steps_interactive.pm:821 steps_interactive.pm:973
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: steps_gtk.pm:747
+#: steps_gtk.pm:754
 #, c-format
 msgid "Media Selection"
 msgstr "介质选择"
 
-#: steps_gtk.pm:756 steps_interactive.pm:343
+#: steps_gtk.pm:763 steps_interactive.pm:343
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -968,7 +978,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: steps_gtk.pm:772 steps_interactive.pm:349
+#: steps_gtk.pm:779 steps_interactive.pm:349
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -980,7 +990,7 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: steps_gtk.pm:774 steps_interactive.pm:351
+#: steps_gtk.pm:781 steps_interactive.pm:351
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"