sync with code

1 files changed, 29 insertions, 35 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 258098f35..923d84b80 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: 2010-05-01 16:50+0200\n"
+"POT-Creation-Date: 2011-05-19 02:52+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"
@@ -18,30 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../advertising/IM_flash.pl:1
+#: ../../advertising/01_IM_mageia.pl:1 ../../advertising/02_IM_mageia.pl:1
+#: ../../advertising/03_IM_mageia.pl:1
 #, c-format
-msgid "Your desktop on a USB key"
-msgstr "U 盘上的桌面"
-
-#: ../../advertising/IM_free.pl:1
-#, c-format
-msgid "The 100%% open source Mageia distribution"
-msgstr "100%% 开放源代码的 Mageia 发行版"
-
-#: ../../advertising/IM_one.pl:1
-#, c-format
-msgid "Explore Linux easily with Mageia One"
-msgstr "用 Mageia One 轻松探索 Linux"
-
-#: ../../advertising/IM_pwp.pl:1
-#, c-format
-msgid "A full Mageia desktop, with support"
-msgstr "Mageia 桌面旗舰产品，附带完善的售后服务支持"
-
-#: ../../advertising/IM_range.pl:1
-#, c-format
-msgid "Mageia: distributions for everybody's needs"
-msgstr "Mageia 在手，应用无忧"
+msgid "Mageia, the new Linux distribution"
+msgstr ""
 
 #: any.pm:109
 #, c-format
@@ -94,14 +75,12 @@ msgstr "URL 必须以 ftp:// 或 http:// 开始"
 
 #: any.pm:182
 #, c-format
-msgid ""
-"Contacting %s web site to get the list of available mirrors..."
+msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr "正在连接 %s 网站获得可用镜像的列表..."
 
 #: any.pm:187
 #, c-format
-msgid ""
-"Failed contacting %s web site to get the list of available mirrors"
+msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr "连接 %s 网站以获得可用镜像的列表失败"
 
 #: any.pm:197
@@ -289,17 +268,17 @@ msgstr "正在禁用网络"
 msgid "Please wait, retrieving file"
 msgstr "请稍候，正在获取文件"
 
-#: media.pm:717
+#: media.pm:715
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
 
-#: media.pm:757
+#: media.pm:755
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "正在将软件包复制到磁盘中以备后用"
 
-#: media.pm:810
+#: media.pm:808
 #, c-format
 msgid "Copying in progress"
 msgstr "复制进行中"
@@ -369,8 +348,8 @@ msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
 "(LibreOffice Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"办公程序: 字处理(LibreOffice Writer、Kword), 电子表格(LibreOffice "
-"Calc、Kspread)、PDF 阅读器等"
+"办公程序: 字处理(LibreOffice Writer、Kword), 电子表格(LibreOffice Calc、"
+"Kspread)、PDF 阅读器等"
 
 #: share/meta-task/compssUsers.pl:22
 #, c-format
@@ -1025,9 +1004,9 @@ msgid "Upgrade previous installation (not recommended)"
 msgstr "升级先前的安装(不推荐)"
 
 #: steps_interactive.pm:211
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Installer has detected that your installed Mageia system could not\n"
+"Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
 "\n"
 "New installation replacing your previous one is recommended.\n"
@@ -1532,6 +1511,21 @@ msgid ""
 "Exit"
 msgstr "退出"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "U 盘上的桌面"
+
+#~ msgid "The 100%% open source Mageia distribution"
+#~ msgstr "100%% 开放源代码的 Mageia 发行版"
+
+#~ msgid "Explore Linux easily with Mageia One"
+#~ msgstr "用 Mageia One 轻松探索 Linux"
+
+#~ msgid "A full Mageia desktop, with support"
+#~ msgstr "Mageia 桌面旗舰产品，附带完善的售后服务支持"
+
+#~ msgid "Mageia: distributions for everybody's needs"
+#~ msgstr "Mageia 在手，应用无忧"
+
 #~ msgid ""
 #~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 #~ "gnumeric), pdf viewers, etc"