update zh_CN translation

2 files changed, 24 insertions, 112 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index 4405a9f00..6998d270d 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -19,9 +19,9 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../../advertising/01_IM_mageia.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Welcome"
-msgstr "欢迎进入 Gramplet"
+msgstr "欢迎"
 
 #: ../../advertising/02_IM_mageia.pl:1
 #, c-format
@@ -1053,7 +1053,7 @@ msgid "Upgrade previous installation (not recommended)"
 msgstr "升级先前的安装(不推荐)"
 
 #: steps_interactive.pm:223
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Installer has detected that your installed Linux system could not\n"
 "safely be upgraded to %s.\n"
@@ -1063,7 +1063,7 @@ msgid ""
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
 msgstr ""
-"安装程序检测到您所安装的 Mageia 系统无法安全升级到 %s。\n"
+"安装程序检测到您所安装的 Linux 系统无法安全升级到 %s。\n"
 "\n"
 "我们建议您进行全新安装，以便替换您先前的系统。\n"
 "\n"
@@ -1369,9 +1369,9 @@ msgstr "正在准备引导程序..."
 
 #. -PO: This is NOT the boot loader!!!!
 #: steps_interactive.pm:1052
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing initial startup program..."
-msgstr "正在准备安装"
+msgstr "正在准备安装初始安装程序..."
 
 #: steps_interactive.pm:1053
 #, c-format
@@ -1559,37 +1559,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "退出"
-
-#~ msgid "Bad package"
-#~ msgstr "有错的软件包"
-
-#, fuzzy
-#~ msgid "Preparing boot images..."
-#~ msgstr "正在准备引导程序..."
-
-#~ msgid ""
-#~ "_: Keep these entry short\n"
-#~ "Networking"
-#~ 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"
-#~ msgstr ""
-#~ "办公程序: 字处理(kword、abiword), 电子表格(kspread、gnumeric)、pdf 阅读器"
-#~ "等"
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 6b1c38df9..b4e5d4785 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -540,13 +540,13 @@ msgid "Please choose a language to use"
 msgstr "请选择要使用的语言。"
 
 #: any.pm:1156
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mageia 可以支持多种语言。请选择您想要安装的语言。\n"
+"%s 可以支持多种语言。请选择您想要安装的语言。\n"
 "安装完成并重新启动系统后它们就可以使用。"
 
 #: any.pm:1158 fs/partitioning_wizard.pm:174
@@ -555,7 +555,7 @@ msgid "Mageia"
 msgstr "Mageia"
 
 #: any.pm:1159
-#, fuzzy, c-format
+#, c-format
 msgid "Multiple languages"
 msgstr "多语言"
 
@@ -1349,9 +1349,9 @@ msgid "Unknown"
 msgstr "未知"
 
 #: diskdrake/hd_gtk.pm:395
-#, fuzzy, c-format
+#, c-format
 msgid "Ext4"
-msgstr "退出"
+msgstr "Ext4"
 
 #: diskdrake/hd_gtk.pm:395 fs/partitioning_wizard.pm:403
 #, c-format
@@ -1627,12 +1627,12 @@ msgid "Logical volume name "
 msgstr "逻辑卷标"
 
 #: diskdrake/interactive.pm:510
-#, fuzzy, c-format
+#, c-format
 msgid "Encrypt partition"
-msgstr "加密算法"
+msgstr "加密分区"
 
 #: diskdrake/interactive.pm:511
-#, fuzzy, c-format
+#, c-format
 msgid "Encryption key "
 msgstr "加密密钥"
 
@@ -1647,9 +1647,9 @@ msgid "The encryption keys do not match"
 msgstr "两次加密密钥不符"
 
 #: diskdrake/interactive.pm:525
-#, fuzzy, c-format
+#, c-format
 msgid "Missing encryption key"
-msgstr "文件系统加密密钥"
+msgstr "缺少加密密钥"
 
 #: diskdrake/interactive.pm:545
 #, c-format
@@ -2665,11 +2665,11 @@ msgid "Erase and use entire disk"
 msgstr "清除并使用整个磁盘"
 
 #: fs/partitioning_wizard.pm:237
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You have more than one hard disk drive, which one do you want the installer "
 "to use?"
-msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
+msgstr "您有不只一个硬盘, 您要在哪个上面安装系统?"
 
 #: fs/partitioning_wizard.pm:245 fsedit.pm:634
 #, c-format
@@ -2696,9 +2696,9 @@ msgstr ""
 "做完之后, 不要忘记用“w”命令保存您的修改"
 
 #: fs/partitioning_wizard.pm:403
-#, fuzzy, c-format
+#, c-format
 msgid "Ext2/3/4"
-msgstr "Ext3"
+msgstr "Ext2/3/4"
 
 #: fs/partitioning_wizard.pm:433 fs/partitioning_wizard.pm:579
 #, c-format
@@ -2784,7 +2784,7 @@ msgid "There is already a partition with mount point %s\n"
 msgstr "已经有一个分区的挂载点是 %s\n"
 
 #: fsedit.pm:434
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
 "No bootloader is able to handle this without a /boot partition.\n"
@@ -2795,14 +2795,13 @@ msgstr ""
 "所以, 请增加一个 /boot 分区。"
 
 #: fsedit.pm:440
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Metadata version unsupported for a boot partition. Please be sure to add a "
 "separate /boot partition."
 msgstr ""
-"您选择了把软件 RAID 分区作为根(/)。\n"
-"如果没有一个 /boot 分区, 各种启动引导程序都无法处理这种情况。\n"
-"所以, 请增加一个 /boot 分区。"
+"启动分区不支持元数据版本。\n"
+"所以, 请增加一个单独的 /boot 分区。"
 
 #: fsedit.pm:448
 #, fuzzy, c-format
@@ -6827,56 +6826,3 @@ msgstr ""
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
-
-#~ msgid ""
-#~ "Launch packet filtering for Linux kernel 2.2 series, to set\n"
-#~ "up a firewall to protect your machine from network attacks."
-#~ msgstr ""
-#~ "启动内核 2.2 的数据包过滤功能, 设置防火墙\n"
-#~ "以保护您的机器不受网络攻击。"
-
-#~ msgid "File sharing"
-#~ msgstr "文件共享"
-
-#~ msgid "Enable 5.1 sound with Pulse Audio"
-#~ msgstr "启用 Pulse Audio 的5.1声道"
-
-#~ msgid "Enable user switching for audio applications"
-#~ msgstr "让用户能选择音频程序"
-
-#~ msgid ""
-#~ "Most of these components, but excluding the applications and software "
-#~ "provided by Google Inc. or \n"
-#~ "its subsidiaries (\"Google Software\"), are governed under the terms and "
-#~ "conditions of the GNU \n"
-#~ "General Public Licence, hereafter called \"GPL\", or of similar licenses."
-#~ msgstr ""
-#~ "除 Goolge Inc 及其子公司所提供的应用软件和软件之外，这些组件中的绝大多数"
-#~ "以 GNU GPL 许可协议(以后简称“GPL”)或类似的协议发布。"
-
-#~ msgid ""
-#~ "Most of these components are governed under the terms and conditions of "
-#~ "the GNU \n"
-#~ "General Public Licence, hereafter called \"GPL\", or of similar licenses."
-#~ msgstr ""
-#~ "这些组件中的绝大多数以 GNU GPL 许可协议(以后简称“GPL”)或类似的协议发布。"
-
-#~ msgid "Restrict command line options"
-#~ msgstr "限制命令行选项"
-
-#~ msgid "restrict"
-#~ msgstr "限制"
-
-#~ msgid ""
-#~ "Option ``Restrict command line options'' is of no use without a password"
-#~ msgstr "没有密码不能使用“限定命令行选项”"
-
-#~ msgid "Use an encrypted filesystem"
-#~ msgstr "使用加密的文件系统"
-
-#~ msgid ""
-#~ "To ensure data integrity after resizing the partition(s), \n"
-#~ "filesystem checks will be run on your next boot into Microsoft Windows®"
-#~ msgstr ""
-#~ "为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Microsoft Windows® "
-#~ "时可能会自动运行文件系统检查。"