Update Chinese (Simplified) translation from Tx

1 files changed, 38 insertions, 64 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index de77cc4..4a5621d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,22 @@
-# Drakwizard wizard's Portable Object file for Simplified Chinese locale
-# Copyright (C) 2002 Free Software Foundation, Inc.
-# wiz2po <adesmons@mandriva.com> 2002.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 
+# Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2002
-# Shiyu Tang <shiyutang@netscape.net>, 2003, 2004
-# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005
-#
+# Funda Wang <fundawang@linux.net.cn>, 2003-2005
+# Shiyu Tang <shiyutang@netscape.net>, 2003-2004
+# zhangmin <zm1990s@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: drakpxelinux 2006\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: Mageia\n"
 "POT-Creation-Date: 2005-09-16 22:46+0200\n"
-"PO-Revision-Date: 2005-09-12 23:17+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2014-04-03 12:06+0000\n"
+"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../drakpxelinux.pl:70
@@ -52,9 +51,9 @@ msgid "Network: DHCP or an IP address"
 msgstr "网络：DHCP 或 IP 地址"
 
 #: ../drakpxelinux.pl:76
-#, fuzzy, c-format
+#, c-format
 msgid "Directory: full path to Mageia install server directory"
-msgstr "目录：Mandriva Linux 安装服务器目录路径"
+msgstr "目录：Mageia 安装服务器的完整路径"
 
 #: ../drakpxelinux.pl:77
 #, c-format
@@ -107,9 +106,9 @@ msgid "DHCP or an IP address"
 msgstr "DHCP 或 IP 地址"
 
 #: ../drakpxelinux.pl:91
-#, fuzzy, c-format
+#, c-format
 msgid "full path to Mageia install server directory"
-msgstr "Mandriva Linux 安装服务器目录的完整路径"
+msgstr "Mageia 安装服务器的完整路径"
 
 #: ../drakpxelinux.pl:92
 #, c-format
@@ -206,10 +205,7 @@ msgid ""
 "missing %s\n"
 "\n"
 "Please install the pxe package."
-msgstr ""
-"缺少 %s\n"
-"\n"
-"请安装 pxe 软件包。"
+msgstr "缺少 %s\n\n请安装 pxe 软件包。"
 
 #: ../drakpxelinux.pl:306 ../drakpxelinux.pl:1196
 #, c-format
@@ -228,34 +224,24 @@ msgid ""
 "Morever we need to name this image, so each boot image is related to a name "
 "in the PXE menu. Thus, the user can choose which image he wants to boot "
 "through PXE."
-msgstr ""
-"要通过网络启动，网络计算机需要有引导映像。除此以外，我们还需要为此映像命名，"
-"这样每个引导映像在 PXE 菜单中就有一个对应的名字了。用户可以通过 PXE 选择想要"
-"启动哪个映像。"
+msgstr "要通过网络启动，网络计算机需要有引导映像。除此以外，我们还需要为此映像命名，这样每个引导映像在 PXE 菜单中就有一个对应的名字了。用户可以通过 PXE 选择想要启动哪个映像。"
 
 #: ../drakpxelinux.pl:309
 #, c-format
 msgid ""
-"For technical reasons, in case of multiple boot images, it's simpler to boot "
-"the networked computer through a kernel (vmlinuz), and to provide one file "
+"For technical reasons, in case of multiple boot images, it's simpler to boot"
+" the networked computer through a kernel (vmlinuz), and to provide one file "
 "with all needed drivers (in our case all.rdz)."
-msgstr ""
-"从技术方面考虑，如果有多个引导映像的话，通过内核(vmlinuz)并提供包含所需全部驱"
-"动程序的文件(all.rdz)来启动网络计算机更加容易。"
+msgstr "从技术方面考虑，如果有多个引导映像的话，通过内核(vmlinuz)并提供包含所需全部驱动程序的文件(all.rdz)来启动网络计算机更加容易。"
 
 #: ../drakpxelinux.pl:314
 #, c-format
 msgid ""
-"When this wizard has finished, the all.rdz image and kernel vmlinuz will be "
-"copied into \n"
+"When this wizard has finished, the all.rdz image and kernel vmlinuz will be copied into \n"
 "%s.\n"
 "\n"
 "The PXE menu list will be updated with this new entry."
-msgstr ""
-"当此向导完成后，all.rdz 映像以及内核 vmlinuz 将被复制到\n"
-"%s。\n"
-"\n"
-"PXE 菜单列表将会用此新项更新。"
+msgstr "当此向导完成后，all.rdz 映像以及内核 vmlinuz 将被复制到\n%s。\n\nPXE 菜单列表将会用此新项更新。"
 
 #: ../drakpxelinux.pl:316
 #, c-format
@@ -275,16 +261,13 @@ msgid "PXE information:"
 msgstr "PXE 信息:"
 
 #: ../drakpxelinux.pl:319
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The PXE information is used to explain the role of the boot image,\n"
 "e.g.:\n"
 "Mageia rescue disk\n"
 "Mageia Cauldron install via http"
-msgstr ""
-"用于描述启动映像角色的 PXE 信息，即:\n"
-"Mandriva Linux 10 抢救磁盘\n"
-"通过 http 的 Mandriva Linux cooker 安装"
+msgstr "PXE信息用于描述启动映像的用途，\n例如：\nMageia 拯救盘\n通过网络安装 Mageia Cauldron"
 
 #: ../drakpxelinux.pl:320
 #, c-format
@@ -356,9 +339,7 @@ msgstr "您无法删除本地项。"
 msgid ""
 "Found a similar entry in PXE list labeled: %s.\n"
 "Choose another label please"
-msgstr ""
-"在 PXE 列表中标签为 %s 中找到类似项。\n"
-"请选择另外一个标签"
+msgstr "在 PXE 列表中标签为 %s 中找到类似项。\n请选择另外一个标签"
 
 #: ../drakpxelinux.pl:433
 #, c-format
@@ -446,9 +427,9 @@ msgid "Initrd image: "
 msgstr "Initrd 映像: "
 
 #: ../drakpxelinux.pl:651
-#, fuzzy, c-format
+#, c-format
 msgid "Mageia installer options"
-msgstr "Mandriva Linux 安装程序选项"
+msgstr "Mageia 安装程序选项"
 
 #: ../drakpxelinux.pl:653 ../drakpxelinux.pl:870
 #, c-format
@@ -535,12 +516,9 @@ msgid ""
 "Intel that allows computers to boot through the network. PXE is stored in "
 "the ROM of new generation network cards. When the computer boots up, the "
 "BIOS loads the PXE ROM in the memory and executes it. A menu is displayed, "
-"allowing the computer to boot an operating system loaded through the network."
-msgstr ""
-"本向导将帮助您配置 PXE 服务器和 PXE 引导映像管理。PXE(Pre-boot Execution "
-"Environment，预启动执行环境)是一个由 Intel 设计的协议，它使得计算机能通过网络"
-"启动。对于新一代网卡，PXE 保存在其 ROM 中。当计算机启动时，BIOS 装载 PXE ROM "
-"到内存中，并且执行。一个菜单将会显示出来，允许计算机从网络中启动操作系统。"
+"allowing the computer to boot an operating system loaded through the "
+"network."
+msgstr "本向导将帮助您配置 PXE 服务器和 PXE 引导映像管理。PXE(Pre-boot Execution Environment，预启动执行环境)是一个由 Intel 设计的协议，它使得计算机能通过网络启动。对于新一代网卡，PXE 保存在其 ROM 中。当计算机启动时，BIOS 装载 PXE ROM 到内存中，并且执行。一个菜单将会显示出来，允许计算机从网络中启动操作系统。"
 
 #: ../drakpxelinux.pl:750
 #, c-format
@@ -551,12 +529,9 @@ msgstr "设置 PXE 服务器"
 #, c-format
 msgid ""
 "We need to use a special dhcpd.conf file with PXE parameter. To set up such "
-"a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you "
-"don't do that, PXE query will not be answered by this server."
-msgstr ""
-"我们需要使用带 PXE 参数的特殊 dhcpd.conf。要设置这样的 DHCP 服务器，请调用 "
-"DHCP 配置向导，选中复选框“启用 PXE”。如果您不这样做的话，此服务器将无法响应 "
-"PXE 查询。"
+"a DHCP server, launch the DHCP wizard and check the box 'Enable PXE'. If you"
+" don't do that, PXE query will not be answered by this server."
+msgstr "我们需要使用带 PXE 参数的特殊 dhcpd.conf。要设置这样的 DHCP 服务器，请调用 DHCP 配置向导，选中复选框“启用 PXE”。如果您不这样做的话，此服务器将无法响应 PXE 查询。"
 
 #: ../drakpxelinux.pl:750
 #, c-format
@@ -572,7 +547,8 @@ msgstr "PXE 服务器界面"
 
 #: ../drakpxelinux.pl:763
 #, c-format
-msgid "The wizard will now prepare all default files to set up your PXE server"
+msgid ""
+"The wizard will now prepare all default files to set up your PXE server"
 msgstr "向导现在将要准备所有的默认文件，以设置您的 PXE 服务器"
 
 #: ../drakpxelinux.pl:768
@@ -667,9 +643,7 @@ msgstr "请配置 PXE 服务器"
 msgid ""
 "It seems this is the first time you run this tool.\n"
 "A wizard will appear to configure your PXE server."
-msgstr ""
-"似乎这是您第一次运行此工具。\n"
-"现在即将出现一个向导帮助您配置 PXE 服务器。"
+msgstr "似乎这是您第一次运行此工具。\n现在即将出现一个向导帮助您配置 PXE 服务器。"
 
 #: ../drakpxelinux.pl:1124
 #, c-format