sync with code

1 files changed, 108 insertions, 104 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index cbd17d833..0f219a385 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-03-21 02:03+0100\n"
+"POT-Creation-Date: 2012-04-17 22:54+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"
@@ -175,7 +175,7 @@ msgid "Removing packages prior to upgrade..."
 msgstr "正在删除由于更新所致的软件包..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:613
+#: any.pm:614
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -188,72 +188,72 @@ msgstr ""
 "\n"
 "您确定要删除这些软件包吗?\n"
 
-#: any.pm:832
+#: any.pm:833
 #, c-format
 msgid "Error reading file %s"
 msgstr "请取文件 %s 出错"
 
-#: any.pm:1039
+#: any.pm:1041
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "下列盘片已重命名:"
 
-#: any.pm:1041
+#: any.pm:1043
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s(以前的名称为 %s)"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1117 steps_interactive.pm:946
+#: any.pm:1119 steps_interactive.pm:950
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: any.pm:1121
+#: any.pm:1123
 #, c-format
 msgid "Please choose a media"
 msgstr "请选择介质"
 
-#: any.pm:1137
+#: any.pm:1139
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "文件已经存在。覆盖吗?"
 
-#: any.pm:1141
+#: any.pm:1143
 #, c-format
 msgid "Permission denied"
 msgstr "没有权限"
 
-#: any.pm:1189
+#: any.pm:1191
 #, c-format
 msgid "Bad NFS name"
 msgstr "无效的 NFS 名称"
 
-#: any.pm:1210
+#: any.pm:1212
 #, c-format
 msgid "Bad media %s"
 msgstr "无效的介质 %s"
 
-#: any.pm:1253
+#: any.pm:1256
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "无法在分区完成之前进行屏幕捕捉"
 
-#: any.pm:1261
+#: any.pm:1264
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
@@ -268,7 +268,7 @@ msgstr "安装"
 msgid "Configuration"
 msgstr "配置"
 
-#: install2.pm:168
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "您还必须格式化 %s"
@@ -297,47 +297,47 @@ msgstr "正在禁用网络"
 msgid "Please wait, retrieving file"
 msgstr "请稍候，正在获取文件"
 
-#: media.pm:724
+#: media.pm:725
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
 
-#: media.pm:764
+#: media.pm:765
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在将软件包复制到磁盘中以备后用"
 
-#: media.pm:817
+#: media.pm:818
 #, c-format
 msgid "Copying in progress"
 msgstr "复制进行中"
 
-#: pkgs.pm:33
+#: pkgs.pm:59
 #, c-format
 msgid "must have"
 msgstr "必须拥有"
 
-#: pkgs.pm:34
+#: pkgs.pm:60
 #, c-format
 msgid "important"
 msgstr "非常重要"
 
-#: pkgs.pm:35
+#: pkgs.pm:61
 #, c-format
 msgid "very nice"
 msgstr "比较重要"
 
-#: pkgs.pm:36
+#: pkgs.pm:62
 #, c-format
 msgid "nice"
 msgstr "一般"
 
-#: pkgs.pm:37
+#: pkgs.pm:63
 #, c-format
 msgid "maybe"
 msgstr "或许有用"
 
-#: pkgs.pm:246
+#: pkgs.pm:272
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -346,22 +346,22 @@ msgstr ""
 "%s 所请求的某些软件包无法安装:\n"
 "%s"
 
-#: pkgs.pm:334
+#: pkgs.pm:360
 #, c-format
 msgid "An error occurred:"
 msgstr "发生了一个错误:"
 
-#: pkgs.pm:807
+#: pkgs.pm:833
 #, c-format
 msgid "Do not ask again"
 msgstr "不要再次询问"
 
-#: pkgs.pm:823
+#: pkgs.pm:849
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: pkgs.pm:824
+#: pkgs.pm:850
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安装软件包失败:"
@@ -693,7 +693,7 @@ msgstr ""
 "发生错误, 可是我不知道该怎样处理才好。\n"
 "继续下去会怎样就看您的运气了。"
 
-#: steps.pm:451
+#: steps.pm:457
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -771,31 +771,26 @@ msgstr "自定义桌面"
 msgid "Here's a preview of the '%s' desktop."
 msgstr "这是“%s”桌面的预览。"
 
-#: steps_gtk.pm:305
+#: steps_gtk.pm:304
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "单击图像可查看更大的预览"
 
-#: steps_gtk.pm:323 steps_interactive.pm:617 steps_list.pm:30
+#: steps_gtk.pm:322 steps_interactive.pm:619 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "程序组选择"
 
-#: steps_gtk.pm:344 steps_interactive.pm:634
+#: steps_gtk.pm:343 steps_interactive.pm:636
 #, c-format
 msgid "Individual package selection"
 msgstr "选择单个软件包"
 
-#: steps_gtk.pm:368 steps_interactive.pm:554
+#: steps_gtk.pm:367 steps_interactive.pm:555
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "总共大小: %d / %d MB"
 
-#: steps_gtk.pm:410
-#, c-format
-msgid "Bad package"
-msgstr "有错的软件包"
-
 #: steps_gtk.pm:412
 #, c-format
 msgid "Version: "
@@ -816,6 +811,11 @@ msgstr "%d KB\n"
 msgid "Importance: "
 msgstr "重要程度: "
 
+#: steps_gtk.pm:415
+#, c-format
+msgid "No description"
+msgstr ""
+
 #: steps_gtk.pm:448
 #, c-format
 msgid "You cannot select/unselect this package"
@@ -878,83 +878,83 @@ msgstr "您不能不选择这个软件包。它必须升级"
 msgid "Show automatically selected packages"
 msgstr "自动显示选中的软件包"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:504
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: steps_gtk.pm:506
+#: steps_gtk.pm:507
 #, c-format
 msgid "Load/Save selection"
 msgstr "装入/保存选择"
 
-#: steps_gtk.pm:507
+#: steps_gtk.pm:508
 #, c-format
 msgid "Updating package selection"
 msgstr "更新软件包选择"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:513
 #, c-format
 msgid "Minimal install"
 msgstr "最小安装"
 
-#: steps_gtk.pm:525
+#: steps_gtk.pm:526
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
 
-#: steps_gtk.pm:525 steps_interactive.pm:439
+#: steps_gtk.pm:526 steps_interactive.pm:439
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "选择您想要安装的软件包"
 
-#: steps_gtk.pm:542 steps_interactive.pm:648 steps_list.pm:32
+#: steps_gtk.pm:543 steps_interactive.pm:650 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "安装"
 
-#: steps_gtk.pm:572
+#: steps_gtk.pm:573
 #, c-format
 msgid "No details"
 msgstr "无细节"
 
-#: steps_gtk.pm:591
+#: steps_gtk.pm:592
 #, c-format
 msgid "Time remaining:"
 msgstr "剩余时间:"
 
-#: steps_gtk.pm:592
+#: steps_gtk.pm:593
 #, c-format
 msgid "(estimating...)"
 msgstr "(正在估计...)"
 
-#: steps_gtk.pm:622
+#: steps_gtk.pm:623
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d 个软件包"
 
-#: steps_gtk.pm:677 steps_interactive.pm:812 steps_list.pm:43
+#: steps_gtk.pm:678 steps_interactive.pm:814 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "摘要"
 
-#: steps_gtk.pm:696
+#: steps_gtk.pm:697
 #, c-format
 msgid "Configure"
 msgstr "配置"
 
-#: steps_gtk.pm:713 steps_interactive.pm:808 steps_interactive.pm:958
+#: steps_gtk.pm:714 steps_interactive.pm:810 steps_interactive.pm:962
 #, c-format
 msgid "not configured"
 msgstr "未配置"
 
-#: steps_gtk.pm:747
+#: steps_gtk.pm:748
 #, c-format
 msgid "Media Selection"
 msgstr "介质选择"
 
-#: steps_gtk.pm:756 steps_interactive.pm:340
+#: steps_gtk.pm:757 steps_interactive.pm:340
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -963,7 +963,7 @@ msgstr ""
 "找到了下列安装介质。\n"
 "如果您想要跳过其中一些, 请不要选中。"
 
-#: steps_gtk.pm:772 steps_interactive.pm:346
+#: steps_gtk.pm:773 steps_interactive.pm:346
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -975,7 +975,7 @@ msgstr ""
 "然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
 "软件使用。"
 
-#: steps_gtk.pm:774 steps_interactive.pm:348
+#: steps_gtk.pm:775 steps_interactive.pm:348
 #, c-format
 msgid "Copy whole CDs"
 msgstr "复制整张光盘"
@@ -1152,104 +1152,104 @@ msgstr "桌面选择"
 msgid "You can choose your workstation desktop profile."
 msgstr "您可以选择您的工作站配置文件："
 
-#: steps_interactive.pm:568
+#: steps_interactive.pm:569
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "您选择的超过可用空间"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:585
 #, c-format
 msgid "Type of install"
 msgstr "安装类型"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:586
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr "您没有选择任何的组件, 请选择最小安装:"
 
-#: steps_interactive.pm:590
+#: steps_interactive.pm:591
 #, c-format
 msgid "With X"
 msgstr "安装 X"
 
-#: steps_interactive.pm:591
+#: steps_interactive.pm:592
 #, c-format
 msgid "Install suggested packages"
 msgstr "安装建议的软件包"
 
-#: steps_interactive.pm:592
+#: steps_interactive.pm:593
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "安装基础文档(建议!)"
 
-#: steps_interactive.pm:593
+#: steps_interactive.pm:594
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "真正最小安装(注意没有 urpmi 包管理工具)"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Preparing installation"
 msgstr "正在准备安装"
 
-#: steps_interactive.pm:657
+#: steps_interactive.pm:659
 #, c-format
 msgid "Installing package %s"
 msgstr "正在安装软件包 %s"
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "排列软件包时出错: "
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "Go on anyway?"
 msgstr "真的要继续?"
 
-#: steps_interactive.pm:685
+#: steps_interactive.pm:687
 #, c-format
 msgid "Retry"
 msgstr "重试"
 
-#: steps_interactive.pm:686
+#: steps_interactive.pm:688
 #, c-format
 msgid "Skip this package"
 msgstr "跳过此软件包"
 
-#: steps_interactive.pm:687
+#: steps_interactive.pm:689
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "跳过介质“%s”中的全部软件包"
 
-#: steps_interactive.pm:688
+#: steps_interactive.pm:690
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "返回介质和软件包选择"
 
-#: steps_interactive.pm:691
+#: steps_interactive.pm:693
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "安装软件包 %s 时出错。"
 
-#: steps_interactive.pm:710
+#: steps_interactive.pm:712
 #, c-format
 msgid "Post-install configuration"
 msgstr "安装后的配置"
 
-#: steps_interactive.pm:717
+#: steps_interactive.pm:719
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "请确定更新模块介质位于驱动器 %s"
 
-#: steps_interactive.pm:745 steps_list.pm:47
+#: steps_interactive.pm:747 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "更新"
 
-#: steps_interactive.pm:746
+#: steps_interactive.pm:748
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1268,100 +1268,101 @@ msgstr ""
 "\n"
 "您是否要安装升级包?"
 
-#: steps_interactive.pm:854
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:858
 #, c-format
 msgid "%s on %s"
 msgstr "位于 %2$s 上的 %1$s"
 
-#: steps_interactive.pm:886 steps_interactive.pm:893 steps_interactive.pm:906
-#: steps_interactive.pm:923 steps_interactive.pm:938
+#: steps_interactive.pm:890 steps_interactive.pm:897 steps_interactive.pm:910
+#: steps_interactive.pm:927 steps_interactive.pm:942
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: steps_interactive.pm:907 steps_interactive.pm:924
+#: steps_interactive.pm:911 steps_interactive.pm:928
 #, c-format
 msgid "Sound card"
 msgstr "声卡"
 
-#: steps_interactive.pm:927
+#: steps_interactive.pm:931
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "您有 ISA 声卡吗?"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:933
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:935
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
 
-#: steps_interactive.pm:939
+#: steps_interactive.pm:943
 #, c-format
 msgid "Graphical interface"
 msgstr "图形界面"
 
-#: steps_interactive.pm:945 steps_interactive.pm:956
+#: steps_interactive.pm:949 steps_interactive.pm:960
 #, c-format
 msgid "Network & Internet"
 msgstr "网络和 Internet"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:961
 #, c-format
 msgid "Proxies"
 msgstr "代理服务器"
 
-#: steps_interactive.pm:958
+#: steps_interactive.pm:962
 #, c-format
 msgid "configured"
 msgstr "已配置"
 
-#: steps_interactive.pm:968
+#: steps_interactive.pm:972
 #, c-format
 msgid "Security Level"
 msgstr "安全级别"
 
-#: steps_interactive.pm:987
+#: steps_interactive.pm:992
 #, c-format
 msgid "Firewall"
 msgstr "防火墙"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "activated"
 msgstr "已激活"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "disabled"
 msgstr "已禁用"
 
-#: steps_interactive.pm:1005
+#: steps_interactive.pm:1010
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有配置过 X。您真的想要这样吗?"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "正在准备引导程序..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在准备安装"
 
-#: steps_interactive.pm:1035
+#: steps_interactive.pm:1040
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "请稍候，这可能需要一会儿..."
 
-#: steps_interactive.pm:1046
+#: steps_interactive.pm:1051
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1373,24 +1374,24 @@ msgstr ""
 "续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是："
 "root=%s"
 
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1064
 #, 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:1091
+#: steps_interactive.pm:1096
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中插入一张空白软盘"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1098
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: steps_interactive.pm:1104
+#: steps_interactive.pm:1109
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1401,12 +1402,12 @@ msgstr ""
 "\n"
 "您真的要现在退出吗?"
 
-#: steps_interactive.pm:1114
+#: steps_interactive.pm:1119
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: steps_interactive.pm:1117
+#: steps_interactive.pm:1122
 #, c-format
 msgid "Reboot"
 msgstr "重新启动"
@@ -1543,6 +1544,9 @@ msgid ""
 "Exit"
 msgstr "退出"
 
+#~ msgid "Bad package"
+#~ msgstr "有错的软件包"
+
 #, fuzzy
 #~ msgid "Preparing boot images..."
 #~ msgstr "正在准备引导程序..."