sync with code

1 files changed, 15 insertions, 14 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index eae7d90e3..fa9f80882 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-04-17 22:54+0200\n"
+"POT-Creation-Date: 2012-04-18 20:30+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"
@@ -346,22 +346,22 @@ msgstr ""
 "%s 所请求的某些软件包无法安装:\n"
 "%s"
 
-#: pkgs.pm:360
+#: pkgs.pm:369
 #, c-format
 msgid "An error occurred:"
 msgstr "发生了一个错误:"
 
-#: pkgs.pm:833
+#: pkgs.pm:843 pkgs.pm:880
 #, c-format
 msgid "Do not ask again"
 msgstr "不要再次询问"
 
-#: pkgs.pm:849
+#: pkgs.pm:859
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: pkgs.pm:850
+#: pkgs.pm:860
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "安装软件包失败:"
@@ -1352,17 +1352,18 @@ msgstr "您还没有配置过 X。您真的想要这样吗?"
 msgid "Preparing bootloader..."
 msgstr "正在准备引导程序..."
 
-#: steps_interactive.pm:1039
+#. -PO: This is NOT the boot loader!!!!
+#: steps_interactive.pm:1041
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在准备安装"
 
-#: steps_interactive.pm:1040
+#: steps_interactive.pm:1042
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "请稍候，这可能需要一会儿..."
 
-#: steps_interactive.pm:1051
+#: steps_interactive.pm:1053
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1374,24 +1375,24 @@ msgstr ""
 "续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是："
 "root=%s"
 
-#: steps_interactive.pm:1064
+#: steps_interactive.pm:1066
 #, 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:1096
+#: steps_interactive.pm:1098
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "请在驱动器 %s 中插入一张空白软盘"
 
-#: steps_interactive.pm:1098
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "正在创建自动安装软盘..."
 
-#: steps_interactive.pm:1109
+#: steps_interactive.pm:1111
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1402,12 +1403,12 @@ msgstr ""
 "\n"
 "您真的要现在退出吗?"
 
-#: steps_interactive.pm:1119
+#: steps_interactive.pm:1121
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: steps_interactive.pm:1122
+#: steps_interactive.pm:1124
 #, c-format
 msgid "Reboot"
 msgstr "重新启动"