sync with code

1 files changed, 110 insertions, 44 deletions

diff --git a/perl-install/install/share/po/zh_CN.po b/perl-install/install/share/po/zh_CN.po
index c51efb56c..b0931b1f9 100644
--- a/perl-install/install/share/po/zh_CN.po
+++ b/perl-install/install/share/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2000,2002
 # Funda Wang <fundawang@linux.net.cn>, 2002-2005
@@ -12,14 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-19 20:52+0100\n"
+"POT-Creation-Date: 2015-05-20 22:53+0200\n"
 "PO-Revision-Date: 2015-02-13 05:25+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../../advertising/01_IM_mageia.pl:1
@@ -77,8 +78,7 @@ msgstr ""
 msgid "Do you have further supplementary media?"
 msgstr "您有其它赠品介质吗?"
 
-#. -PO: keep the double empty lines between sections, this is formatted a la
-#. LaTeX
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: any.pm:154
 #, c-format
 msgid ""
@@ -86,7 +86,11 @@ msgid ""
 "\n"
 "\n"
 "Do you have a supplementary installation medium to configure?"
-msgstr "找到了下列介质，并且在安装时会使用：%s。\n\n\n您是否想要配置赠品安装介质?"
+msgstr ""
+"找到了下列介质，并且在安装时会使用：%s。\n"
+"\n"
+"\n"
+"您是否想要配置赠品安装介质?"
 
 #: any.pm:162
 #, c-format
@@ -193,8 +197,8 @@ msgstr ""
 #: any.pm:436
 #, c-format
 msgid ""
-"Some hardware on your machine needs some non free firmwares in order for the"
-" free software drivers to work."
+"Some hardware on your machine needs some non free firmwares in order for the "
+"free software drivers to work."
 msgstr ""
 
 #: any.pm:437
@@ -222,8 +226,8 @@ msgstr ""
 #: any.pm:478
 #, c-format
 msgid ""
-"\"%s\" contains software that can not be distributed in every country due to"
-" software patents."
+"\"%s\" contains software that can not be distributed in every country due to "
+"software patents."
 msgstr ""
 
 #: any.pm:479
@@ -257,8 +261,7 @@ msgstr "正在寻找可升级的程序..."
 msgid "Removing packages prior to upgrade..."
 msgstr "正在删除由于更新所致的软件包..."
 
-#. -PO: keep the double empty lines between sections, this is formatted a la
-#. LaTeX
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: any.pm:881
 #, c-format
 msgid ""
@@ -266,7 +269,11 @@ msgid ""
 "\n"
 "\n"
 "Do you really want to remove these packages?\n"
-msgstr "为了升级您的系统, 将要删除下列的软件包: %s\n\n\n您确定要删除这些软件包吗?\n"
+msgstr ""
+"为了升级您的系统, 将要删除下列的软件包: %s\n"
+"\n"
+"\n"
+"您确定要删除这些软件包吗?\n"
 
 #: any.pm:1096
 #, c-format
@@ -358,7 +365,9 @@ msgstr "您还必须格式化 %s"
 msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
 "You can find some information about them at: %s"
-msgstr "您系统中的部分硬件需要“私有”的驱动程序才能工作。\n有关它们的情况, 请您查看: %s"
+msgstr ""
+"您系统中的部分硬件需要“私有”的驱动程序才能工作。\n"
+"有关它们的情况, 请您查看: %s"
 
 #: interactive.pm:22
 #, c-format
@@ -435,7 +444,9 @@ msgstr "无描述"
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
 "%s"
-msgstr "%s 所请求的某些软件包无法安装:\n%s"
+msgstr ""
+"%s 所请求的某些软件包无法安装:\n"
+"%s"
 
 #: pkgs.pm:382 pkgs.pm:409
 #, c-format
@@ -477,7 +488,9 @@ msgstr "办公工作站"
 msgid ""
 "Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets "
 "(LibreOffice Calc, Kspread), PDF viewers, etc"
-msgstr "办公程序: 字处理(LibreOffice Writer、Kword), 电子表格(LibreOffice Calc、Kspread)、PDF 阅读器等"
+msgstr ""
+"办公程序: 字处理(LibreOffice Writer、Kword), 电子表格(LibreOffice Calc、"
+"Kspread)、PDF 阅读器等"
 
 #: share/meta-task/compssUsers.pl:26
 #, c-format
@@ -700,8 +713,8 @@ msgstr "KDE 工作站"
 #: share/meta-task/compssUsers.pl:153
 #, c-format
 msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection"
-" of accompanying tools"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr "KDE 桌面环境, 基本的图形环境和一组配套的工具"
 
 #: share/meta-task/compssUsers.pl:158
@@ -840,15 +853,21 @@ msgstr "服务器配置向导"
 msgid ""
 "An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
-msgstr "发生错误, 可是我不知道该怎样处理才好。\n继续下去会怎样就看您的运气了。"
+msgstr ""
+"发生错误, 可是我不知道该怎样处理才好。\n"
+"继续下去会怎样就看您的运气了。"
 
 #: steps.pm:458
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
-msgstr "一些重要软件包没有正确的安装。\n您的光盘或者驱动器可能有缺陷。\n请在一台安装好的电脑上检查光盘, 命令是“rpm -qpl media/main/*.rpm”\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
+"\"\n"
+msgstr ""
+"一些重要软件包没有正确的安装。\n"
+"您的光盘或者驱动器可能有缺陷。\n"
+"请在一台安装好的电脑上检查光盘, 命令是“rpm -qpl media/main/*.rpm”\n"
 
 #: steps_auto_install.pm:71 steps_stdio.pm:27
 #, c-format
@@ -876,7 +895,10 @@ msgid ""
 "Your system is low on resources. You may have some problem installing\n"
 "%s. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
-msgstr "您系统的资源过低。您在安装 %s 的过程中可能遇到问题。\n如果您真的遇到问题的话，可以试试文本安装。要进入文本安装，请在启动时按“F1”，然后输入“text”。"
+msgstr ""
+"您系统的资源过低。您在安装 %s 的过程中可能遇到问题。\n"
+"如果您真的遇到问题的话，可以试试文本安装。要进入文本安装，请在启动时按“F1”，"
+"然后输入“text”。"
 
 #: steps_gtk.pm:242 steps_gtk.pm:757
 #, c-format
@@ -1101,14 +1123,21 @@ msgstr "未配置"
 msgid ""
 "The following installation media have been found.\n"
 "If you want to skip some of them, you can unselect them now."
-msgstr "找到了下列安装介质。\n如果您想要跳过其中一些, 请不要选中。"
+msgstr ""
+"找到了下列安装介质。\n"
+"如果您想要跳过其中一些, 请不要选中。"
 
 #: steps_gtk.pm:782 steps_interactive.pm:321
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard disk drive before installation.\n"
-"It will then continue from the hard disk drive and the packages will remain available once the system is fully installed."
-msgstr "您可以选择在安装之前将光盘的全部内容复制到硬盘中。\n然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加软件使用。"
+"You have the option to copy the contents of the CDs onto the hard disk drive "
+"before installation.\n"
+"It will then continue from the hard disk drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
+"您可以选择在安装之前将光盘的全部内容复制到硬盘中。\n"
+"然后，安装将会从硬盘继续进行。当系统安装完成后，软件包仍然保留，以供日后添加"
+"软件使用。"
 
 #: steps_gtk.pm:784 steps_interactive.pm:323
 #, c-format
@@ -1182,7 +1211,12 @@ msgid ""
 "\n"
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
-msgstr "安装程序检测到您所安装的 Linux 系统无法安全升级到 %s。\n\n我们建议您进行全新安装，以便替换您先前的系统。\n\n警告：您在选择“全新安装”之前应该备份您所有的个人数据。"
+msgstr ""
+"安装程序检测到您所安装的 Linux 系统无法安全升级到 %s。\n"
+"\n"
+"我们建议您进行全新安装，以便替换您先前的系统。\n"
+"\n"
+"警告：您在选择“全新安装”之前应该备份您所有的个人数据。"
 
 #: steps_interactive.pm:264
 #, c-format
@@ -1198,9 +1232,14 @@ msgstr "配置 IDE"
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
-msgstr "请换另一片光盘！\n\n请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
+msgstr ""
+"请换另一片光盘！\n"
+"\n"
+"请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
+"如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
 
 #: steps_interactive.pm:372
 #, c-format
@@ -1219,7 +1258,9 @@ msgstr "系统的剩余空间不足以完成安装或升级(%d MB > %d MB)"
 msgid ""
 "Please choose load or save package selection.\n"
 "The format is the same as auto_install generated files."
-msgstr "请选择装入或保存软件包选择息。\n格式与自动安装生成的文件一样。"
+msgstr ""
+"请选择装入或保存软件包选择息。\n"
+"格式与自动安装生成的文件一样。"
 
 #: steps_interactive.pm:430
 #, c-format
@@ -1360,6 +1401,25 @@ msgstr "更新"
 
 #: steps_interactive.pm:740
 #, c-format
+msgid "You now have the opportunity to setup online media."
+msgstr ""
+
+#: steps_interactive.pm:741
+#, c-format
+msgid "This allows to install security updates."
+msgstr ""
+
+#: steps_interactive.pm:742
+#, c-format
+msgid ""
+"To setup those media, you will need to have a working Internet \n"
+"connection.\n"
+"\n"
+"Do you want to setup the update media?"
+msgstr ""
+
+#: steps_interactive.pm:764
+#, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
 "have been updated after the distribution was released. They may\n"
@@ -1369,7 +1429,13 @@ msgid ""
 "connection.\n"
 "\n"
 "Do you want to install the updates?"
-msgstr "您现在有机会下载软件更新包。更新软件包是在发行版发布之后发布的。它们可能包含对一些安全问题或故障的修改。\n\n要下载这些软件包, 您的网络连接必须已经配置好并且可以使用。\n\n您是否要安装升级包?"
+msgstr ""
+"您现在有机会下载软件更新包。更新软件包是在发行版发布之后发布的。它们可能包含"
+"对一些安全问题或故障的修改。\n"
+"\n"
+"要下载这些软件包, 您的网络连接必须已经配置好并且可以使用。\n"
+"\n"
+"您是否要安装升级包?"
 
 #. -PO: example: lilo-graphic on /dev/hda1
 #: steps_interactive.pm:853
@@ -1396,8 +1462,8 @@ msgstr "您有 ISA 声卡吗?"
 #: steps_interactive.pm:931
 #, c-format
 msgid ""
-"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound"
-" card"
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
 msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
 
 #: steps_interactive.pm:933
@@ -1450,13 +1516,8 @@ msgstr "已禁用"
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "您还没有配置过 X。您真的想要这样吗?"
 
-#: steps_interactive.pm:1038
-#, c-format
-msgid "Preparing bootloader..."
-msgstr "正在准备引导程序..."
-
-#. -PO: This is NOT the boot loader!!!!
-#: steps_interactive.pm:1040
+#. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
+#: steps_interactive.pm:1059
 #, c-format
 msgid "Preparing initial startup program..."
 msgstr "正在准备安装初始安装程序..."
@@ -1489,7 +1550,10 @@ msgid ""
 "Some steps are not completed.\n"
 "\n"
 "Do you really want to quit now?"
-msgstr "某些步骤没有完成。\n\n您真的要现在退出吗?"
+msgstr ""
+"某些步骤没有完成。\n"
+"\n"
+"您真的要现在退出吗?"
 
 #: steps_interactive.pm:1112
 #, c-format
@@ -1501,8 +1565,7 @@ msgstr "恭喜"
 msgid "Reboot"
 msgstr "重新启动"
 
-#. -PO: please keep the following messages very short: they must fit in the
-#. left list of the installer!!!
+#. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
 msgid ""
@@ -1633,3 +1696,6 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "退出"
+
+#~ msgid "Preparing bootloader..."
+#~ msgstr "正在准备引导程序..."