Update Chinese (Simplified) translation from Tx

1 files changed, 114 insertions, 497 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c0e85f5b..4766edcb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,27 +1,22 @@
-#
-# Latest versions of po files are at http://www.mandrivalinux.com/l10n/zh_CN.php3
-#
-# urpmi messages for zh_CN locale
-# Copyright (C) 2000 Free Software Foundation, Inc.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 
+# Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2000
-# Jesse Kuang <kjx@mandrakesoft.com>
-# 汤诗语 <shiyu@mandriva.org>, 2003, 2008
-# Funda Wang <fundawang@linux.net.cn>,2002,2003,2004
-#
+# 7rack <vimxiang@gmail.com>, 2014
+# zhangmin <zm1990s@gmail.com>, 2014
+# 汤诗语 <shiyu@mandriva.org>, 2003,2008
 msgid ""
 msgstr ""
-"Project-Id-Version: urpmi\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: Mageia\n"
 "POT-Creation-Date: 2014-09-13 21:15+0200\n"
-"PO-Revision-Date: 2008-03-30 14:22+0800\n"
-"Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
-"Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
-"org>\n"
-"Language: \n"
+"PO-Revision-Date: 2015-02-13 05:26+0000\n"
+"Last-Translator: 7rack <vimxiang@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"
 
 #: ../gurpm/RPMProgressDialog.pm:47
@@ -50,9 +45,9 @@ msgid "Preparing..."
 msgstr "正在准备..."
 
 #: ../gurpm/RPMProgressDialog.pm:313
-#, fuzzy, c-format
+#, c-format
 msgid "Removing package `%s' ..."
-msgstr "删除软件包 %s"
+msgstr "移除包 `%s'  中"
 
 #: ../gurpm/RPMProgressDialog.pm:316
 #, c-format
@@ -98,19 +93,10 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would "
-"allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
-msgstr ""
-"您选择了源代码软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改后再编"
-"译)。\n"
-"\n"
-"您想要执行什么操作?"
+msgstr "您选择了源代码软件包:\n\n%s\n\n您可能并不想在您的计算机上安装它(安装它将允许您对其源代码进行修改后再编译)。\n\n您想要执行什么操作?"
 
 #: ../gurpmi:92 ../gurpmi:103
 #, c-format
@@ -120,12 +106,7 @@ msgid ""
 "%s\n"
 "\n"
 "Proceed?"
-msgstr ""
-"您即将在您的计算机上安装下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"继续吗?"
+msgstr "您即将在您的计算机上安装下列软件包:\n\n%s\n\n继续吗?"
 
 #: ../gurpmi:98
 #, c-format
@@ -135,12 +116,7 @@ msgid ""
 "%s\n"
 "\n"
 "You may prefer to just save it. What is your choice?"
-msgstr ""
-"您即将在您的计算机上安装下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"您也可以选择只是保存相应的软件包。您要进行什么操作?"
+msgstr "您即将在您的计算机上安装下列软件包:\n\n%s\n\n您也可以选择只是保存相应的软件包。您要进行什么操作?"
 
 #: ../gurpmi:116
 #, c-format
@@ -202,9 +178,7 @@ msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-"  --verify-rpm   - 安装之前验证 rpm 签署\n"
-"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
+msgstr "  --verify-rpm   - 安装之前验证 rpm 签署\n                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
 #: ../gurpmi.pm:63 ../urpmf:36 ../urpmi:68 ../urpmq:43
 #, c-format
@@ -259,9 +233,7 @@ msgstr "准备安装软件包..."
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr ""
-"某些要求的软件包无法安装:\n"
-"%s"
+msgstr "某些要求的软件包无法安装:\n%s"
 
 #: ../gurpmi2:99
 #, c-format
@@ -269,10 +241,7 @@ msgid ""
 "Some requested packages cannot be installed:\n"
 "%s\n"
 "Continue installation anyway?"
-msgstr ""
-"某些要求的软件包无法安装:\n"
-"%s\n"
-"仍然继续安装吗?"
+msgstr "某些要求的软件包无法安装:\n%s\n仍然继续安装吗?"
 
 #: ../gurpmi2:119
 #, c-format
@@ -310,10 +279,7 @@ msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
 "Continue installation anyway?"
-msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s\n"
-"仍然继续安装吗?"
+msgstr "要升级其它软件包，需要先删除下列软件包:\n%s\n仍然继续安装吗?"
 
 #: ../gurpmi2:250 ../urpmi:615
 #, c-format
@@ -361,7 +327,7 @@ msgstr "请插入介质“%s”"
 #: ../gurpmi2:307
 #, c-format
 msgid "An error occurred:"
-msgstr ""
+msgstr "发生了一个错误："
 
 #: ../gurpmi2:319
 #, c-format
@@ -373,9 +339,7 @@ msgstr "完成(_D)"
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s"
-msgstr ""
-"安装失败，缺少某些文件:\n"
-"%s"
+msgstr "安装失败，缺少某些文件:\n%s"
 
 #: ../gurpmi2:339
 #, c-format
@@ -407,9 +371,7 @@ msgstr "重新启动 urpmi"
 msgid ""
 "usage: %s [options]\n"
 "where [options] are from\n"
-msgstr ""
-"用法: %s [选项]\n"
-"[选项]的格式为\n"
+msgstr "用法: %s [选项]\n[选项]的格式为\n"
 
 #: ../rpm-find-leaves:17
 #, c-format
@@ -449,7 +411,7 @@ msgstr "正在以限制模式运行 urpmi..."
 #: ../urpm.pm:23
 #, c-format
 msgid "While some packages may have been installed, there were failures.\n"
-msgstr ""
+msgstr "安装某些包时失败了\n"
 
 #: ../urpm.pm:194
 #, c-format
@@ -586,16 +548,10 @@ msgstr "参数太多\n"
 msgid ""
 "%s version %s\n"
 "%s\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
-msgstr ""
-"%s 版本 %s\n"
-"%s\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
+msgstr "%s 版本 %s\n%s\n这是自由软件，可以依照 GNU GPL 重新发布。\n\n用法:\n"
 
 #: ../urpm/args.pm:534
 #, c-format
@@ -900,19 +856,14 @@ msgstr "您可能需要更新您的 urpmi 数据库。"
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
-msgstr ""
-"安装失败，rpm 有问题:\n"
-"%s"
+msgstr "安装失败，rpm 有问题:\n%s"
 
 #: ../urpm/main_loop.pm:108
 #, c-format
 msgid ""
-"There is not enough space on your filesystem to download all packages (%s "
-"needed, %s available).\n"
+"There is not enough space on your filesystem to download all packages (%s needed, %s available).\n"
 "Are you sure you want to continue?"
-msgstr ""
-"您的文件系统中没有足够空间可用来下载全部软件包(需要 %s，但只有 %s)。\n"
-"您确定想要继续吗?"
+msgstr "您的文件系统中没有足够空间可用来下载全部软件包(需要 %s，但只有 %s)。\n您确定想要继续吗?"
 
 #: ../urpm/main_loop.pm:138
 #, c-format
@@ -1028,21 +979,19 @@ msgstr "并行模式时使用关联介质: %s"
 #: ../urpm/media.pm:673
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update, --use-distrib or --parallel"
-msgstr ""
-"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
-"distrib 或 --parallel 一起使用"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib or --parallel"
+msgstr "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-distrib 或 --parallel 一起使用"
 
 #: ../urpm/media.pm:786
-#, fuzzy, c-format
+#, c-format
 msgid "ignoring non-free medium `%s'"
-msgstr "忽略介质 %s"
+msgstr "忽略非自由介质 `%s'"
 
 #: ../urpm/media.pm:795
-#, fuzzy, c-format
+#, c-format
 msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr "忽略介质 %s"
+msgstr ""
 
 #: ../urpm/media.pm:799
 #, c-format
@@ -1333,7 +1282,7 @@ msgstr "架构"
 #: ../urpm/msg.pm:170
 #, c-format
 msgid "(recommended)"
-msgstr ""
+msgstr "（推荐）"
 
 #: ../urpm/msg.pm:185
 #, c-format
@@ -1376,7 +1325,7 @@ msgid "Marking %s as manually installed, it won't be auto-orphaned"
 msgstr "将 %s 标记为手动安装，该软件包不会被标为自动孤立"
 
 #: ../urpm/orphans.pm:527
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following package:\n"
 "%s\n"
@@ -1385,30 +1334,25 @@ msgid_plural ""
 "The following packages:\n"
 "%s\n"
 "are now orphaned."
-msgstr[0] "需要下列软件包之一:"
+msgstr[0] "下列包\n%s\n现在已是孤儿包"
 
 #: ../urpm/orphans.pm:530
-#, fuzzy, c-format
+#, c-format
 msgid "You may wish to remove it."
 msgid_plural "You may wish to remove them."
-msgstr[0] "没有可删除的孤立软件包"
+msgstr[0] "你可以移除它们"
 
 #: ../urpm/orphans.pm:547
 #, c-format
 msgid ""
 "The following package:\n"
 "%s\n"
-"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans"
-"\""
+"is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\""
 msgid_plural ""
 "The following packages:\n"
 "%s\n"
-"are now orphaned, if you wish to remove them, you can use \"urpme --auto-"
-"orphans\""
-msgstr[0] ""
-"下列软件包:\n"
-"%s\n"
-"现在是孤立的了，请使用“urpme --auto-orphans”删除它们。"
+"are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\""
+msgstr[0] "下列软件包:\n%s\n现在是孤立的了，请使用“urpme --auto-orphans”删除它们。"
 
 #: ../urpm/parallel.pm:15
 #, c-format
@@ -1463,8 +1407,8 @@ msgstr "主机 %s cp 失败 (%d)"
 #: ../urpm/parallel_ssh.pm:84
 #, c-format
 msgid ""
-"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
-"code: %d)"
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit"
+" code: %d)"
 msgstr "主机 %2$s %1$s 失败(可能 urpmi 版本不对?)(退出码: %3$d)"
 
 #: ../urpm/removable.pm:46
@@ -1548,18 +1492,14 @@ msgstr "为了保留 %s"
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s"
+msgstr "要升级其它软件包，需要先删除下列软件包:\n%s"
 
 #: ../urpm/select.pm:675
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
-msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s"
+msgstr "要升级其它软件包，需要先删除下列软件包:\n%s"
 
 #: ../urpm/select.pm:702
 #, c-format
@@ -1577,14 +1517,14 @@ msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
 #: ../urpm/signature.pm:77
-#, fuzzy, c-format
+#, c-format
 msgid "SECURITY: The following package is _NOT_ signed (%s): %s"
-msgstr "下列软件包里有 %s: %s"
+msgstr "安全：下列包未签名(%s): %s"
 
 #: ../urpm/signature.pm:83
 #, c-format
 msgid "SECURITY: NOT checking package \"%s\" (due to configuration)"
-msgstr ""
+msgstr "安全：不会检查包 \"%s\" (由于设置原因)"
 
 #: ../urpm/signature.pm:102
 #, c-format
@@ -1599,12 +1539,12 @@ msgstr "缺少签名(%s)"
 #: ../urpm/signature.pm:107
 #, c-format
 msgid "SECURITY: Medium \"%s\" has no key (%s)!"
-msgstr ""
+msgstr "安全：介质\"%s\" 没有密钥 (%s)!"
 
 #: ../urpm/signature.pm:109
 #, c-format
 msgid "Medium without key (%s)"
-msgstr ""
+msgstr "介质没有密钥 (%s)"
 
 #: ../urpm/sys.pm:199
 #, c-format
@@ -1687,9 +1627,7 @@ msgstr "  --noscripts    - 不执行软件包脚本。\n"
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
-"                   下安装/卸载 chroot。\n"
+msgstr "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n                   下安装/卸载 chroot。\n"
 
 #: ../urpme:54 ../urpmi:150 ../urpmq:87
 #, c-format
@@ -1979,9 +1917,9 @@ msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
 #: ../urpmf:75
-#, fuzzy, c-format
+#, c-format
 msgid "  --recommends   - recommends tags\n"
-msgstr "  --requires     - requires 标签\n"
+msgstr ""
 
 #: ../urpmf:76
 #, c-format
@@ -2054,9 +1992,9 @@ msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - 不询问直接删除孤立软件包\n"
 
 #: ../urpmi:80 ../urpmq:52
-#, fuzzy, c-format
+#, c-format
 msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
-msgstr "  --no-suggests  - 不自动选择“推荐的”软件包。\n"
+msgstr ""
 
 #: ../urpmi:81
 #, c-format
@@ -2075,8 +2013,7 @@ msgstr "  --no-install   - 不安装软件包(只下载)。\n"
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
-msgstr ""
-"  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
+msgstr "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
 #: ../urpmi:85
 #, c-format
@@ -2084,9 +2021,7 @@ msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
-msgstr ""
-"  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
-"                   较小的交易。默认为 %d。\n"
+msgstr "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n                   较小的交易。默认为 %d。\n"
 
 #: ../urpmi:89
 #, c-format
@@ -2123,7 +2058,7 @@ msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 msgid ""
 "  --downgrade    - downgrade a package from the version currently installed\n"
 "                   to the previously highest version\n"
-msgstr ""
+msgstr "--降级- 将一个已安装的包降低到此版本\n之前最新的版本\n"
 
 #: ../urpmi:99
 #, c-format
@@ -2146,18 +2081,16 @@ msgid ""
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
 #: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
 msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
-msgstr "  --allow-suggests - 自动选择“推荐的”软件包。\n"
+msgstr ""
 
 #: ../urpmi:109
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n"
-"                   下安装 chroot。\n"
+msgstr "  --use-distrib  - 从发行版树中实时配置 urpmi，特别用于在 --root 选项\n                   下安装 chroot。\n"
 
 #: ../urpmi:111 ../urpmi.addmedia:60 ../urpmi.update:37
 #, c-format
@@ -2176,9 +2109,7 @@ msgstr "  --download-all - 在试图安装之前下载所需的全部软件包\n
 msgid ""
 "  --downloader   - program to use to retrieve distant files. \n"
 "                   known programs: %s\n"
-msgstr ""
-"  --downloader   - 用于重新获取远程文件的程序。\n"
-"                   已知程序：%s\n"
+msgstr "  --downloader   - 用于重新获取远程文件的程序。\n                   已知程序：%s\n"
 
 #: ../urpmi:116
 #, c-format
@@ -2215,36 +2146,28 @@ msgstr "  --limit-rate   - 降低下载速度。\n"
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
-msgstr ""
-"  --resume       - 续传未下载完成的文件\n"
-"                   (--no-resume 禁用它，默认是禁用的)。\n"
+msgstr "  --resume       - 续传未下载完成的文件\n                   (--no-resume 禁用它，默认是禁用的)。\n"
 
 #: ../urpmi:124 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:74
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
-msgstr ""
-"  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
-"                   1080(格式如 <proxyhost[:port]>)。\n"
+msgstr "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n                   1080(格式如 <proxyhost[:port]>)。\n"
 
 #: ../urpmi:126 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - 指定用于代理认证的用户和\n"
-"                   密码(格式如 <用户: 密码>)。\n"
+msgstr "  --proxy-user   - 指定用于代理认证的用户和\n                   密码(格式如 <用户: 密码>)。\n"
 
 #: ../urpmi:128
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
-msgstr ""
-"  --bug          - 输出故障报告\n"
-"                   下一个参数指定输出目录。\n"
+msgstr "  --bug          - 输出故障报告\n                   下一个参数指定输出目录。\n"
 
 #: ../urpmi:134
 #, c-format
@@ -2291,8 +2214,7 @@ msgstr "  --prefer       - 首选的软件包\n"
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
-msgstr ""
-"  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
+msgstr "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
 #: ../urpmi:144
 #, c-format
@@ -2374,9 +2296,7 @@ msgstr "无法创建故障报告的目录 [%s]"
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
 "Use --allow-force to force operation."
-msgstr ""
-"错误: %s 似乎是以只读方式挂载的。\n"
-"请使用 --allow-force 强制操作。"
+msgstr "错误: %s 似乎是以只读方式挂载的。\n请使用 --allow-force 强制操作。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
 #: ../urpmi:426
@@ -2420,9 +2340,7 @@ msgid ""
 "The following package cannot be installed because it depends on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
-"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
-"%s"
+msgstr "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n%s"
 
 #: ../urpmi:487
 #, c-format
@@ -2430,18 +2348,14 @@ msgid ""
 "The following packages can't be installed because they depend on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgstr ""
-"下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
-"%s"
+msgstr "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n%s"
 
 #: ../urpmi:493 ../urpmi:511
 #, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
-msgstr ""
-"\n"
-"仍然继续安装吗?"
+msgstr "\n仍然继续安装吗?"
 
 #: ../urpmi:494 ../urpmi:512 ../urpmi:627 ../urpmi.addmedia:136
 #, c-format
@@ -2453,9 +2367,7 @@ msgstr "(是(Y)/否(n))[是]"
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
-msgstr ""
-"某些要求的软件包无法安装:\n"
-"%s"
+msgstr "某些要求的软件包无法安装:\n%s"
 
 #: ../urpmi:526
 #, c-format
@@ -2468,9 +2380,7 @@ msgid ""
 "The installation cannot continue because the following package\n"
 "has to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
-"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
-"%s\n"
+msgstr "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n%s\n"
 
 #: ../urpmi:536
 #, c-format
@@ -2478,9 +2388,7 @@ msgid ""
 "The installation cannot continue because the following packages\n"
 "have to be removed for others to be upgraded:\n"
 "%s\n"
-msgstr ""
-"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
-"%s\n"
+msgstr "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n%s\n"
 
 #: ../urpmi:544
 #, c-format
@@ -2490,12 +2398,9 @@ msgstr "(只是测试，删除将不会实际发生)"
 #: ../urpmi:563
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following "
-"dependencies:\n"
-"%s\n"
-msgstr ""
-"您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
+"You must first call urpmi with --buildrequires to install the following dependencies:\n"
 "%s\n"
+msgstr "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n%s\n"
 
 #: ../urpmi:573
 #, c-format
@@ -2506,7 +2411,7 @@ msgstr[0] "下列孤立软件包将被删除。"
 #: ../urpmi:597
 #, c-format
 msgid "WARNING: %s option is in use. Some strange problems may happen"
-msgstr ""
+msgstr "注意：%s 选项已使用，可能会出现一些奇怪的问题"
 
 #: ../urpmi:609
 #, c-format
@@ -2518,10 +2423,12 @@ msgstr "(只是测试，安装将不会实际发生)"
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
 
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
-#. -PO: neither the ``with''.  Only what is between <brackets> can be translated.
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not
+#. be translated!
+#. -PO: neither the ``with''.  Only what is between <brackets> can be
+#. translated.
 #: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url>\n"
 "where <url> is one of\n"
@@ -2542,25 +2449,7 @@ msgid ""
 "\n"
 "\n"
 "and [options] are from\n"
-msgstr ""
-"用法: urpmi.addmedia [选项] <名称> <url>\n"
-"  <url> 为以下之一\n"
-"       [file:/]/<路径>\n"
-"       ftp://<登录名>:<密码>@<主机>/<路径>\n"
-"       ftp://<主机>/<路径>\n"
-"       http://<主机>/<路径>\n"
-"       removable://<路径>\n"
-"\n"
-"用法：urpmi.addmedia [选项] --distrib --mirrorlist <url>\n"
-"用法：urpmi.addmedia [选项] --mirrorlist <url> <名称> <相对路径>\n"
-"\n"
-"例：\n"
-"\n"
-"  urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
-"  urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
-"\n"
-"\n"
-"而 [选项] 可以来自\n"
+msgstr "用法: urpmi.addmedia [选项] <名称> <url>\n  <url> 为以下之一\n       [file:/]/<路径>\n       ftp://<登录名>:<密码>@<主机地址>/<路径>\n       ftp://<主机地址>/<路径>\n       http://<主机地址>/<路径>\n       cdrom://<路径>\n\n用法：urpmi.addmedia [选项] --distrib --mirrorlist <url>\n用法：urpmi.addmedia [选项] --mirrorlist <url> <名称> <相对路径>\n\n例：\n\nurpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\nurpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\nurpmi.addmedia --distrib --zeroconf\n\n\n而 [选项] 可以来自\n"
 
 #: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
 #, c-format
@@ -2587,20 +2476,14 @@ msgstr "  --aria2         - 用 aria2 取远程文件。\n"
 msgid ""
 "  --update       - create an update medium, \n"
 "                   or discard non-update media (when used with --distrib)\n"
-msgstr ""
-"  --update       - 创建更新介质，\n"
-"                   或忽略非更新介质(如果和 --distrib 一起使用)\n"
+msgstr "  --update       - 创建更新介质，\n                   或忽略非更新介质(如果和 --distrib 一起使用)\n"
 
 #: ../urpmi.addmedia:68
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi."
-"cfg(5)\n"
-msgstr ""
-"  --xml-info     - 使用特殊的策略以下载 xml 信息文件\n"
-"                   以下中的一个: never, on-demand, update-only, always. cf "
-"urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+msgstr "  --xml-info     - 使用特殊的策略以下载 xml 信息文件\n                   以下中的一个: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
 
 #: ../urpmi.addmedia:70
 #, c-format
@@ -2704,9 +2587,7 @@ msgstr "使用 --distrib 不需要提供 <综合文件的相对路径>"
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
-msgstr ""
-"\n"
-"您是否想要添加介质“%s”?"
+msgstr "\n您是否想要添加介质“%s”?"
 
 #: ../urpmi.addmedia:156 ../urpmi.addmedia:181
 #, c-format
@@ -2728,9 +2609,7 @@ msgstr "远程介质无法使用 %s"
 msgid ""
 "usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
-msgstr ""
-"用法: urpmi.removemedia (-a | <名称> ...)\n"
-"其中 <名称> 是要删除的介质名。\n"
+msgstr "用法: urpmi.removemedia (-a | <名称> ...)\n其中 <名称> 是要删除的介质名。\n"
 
 #: ../urpmi.removemedia:41
 #, c-format
@@ -2757,18 +2636,14 @@ msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 msgid ""
 "the entry to remove is missing\n"
 "(one of %s)\n"
-msgstr ""
-"找不到要删除的项\n"
-"(%s中的一个)\n"
+msgstr "找不到要删除的项\n(%s中的一个)\n"
 
 #: ../urpmi.update:30
 #, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
-msgstr ""
-"用法: urpmi.update [选项] <名称> ...\n"
-"其中 <名称> 是要删除的介质名...\n"
+msgstr "用法: urpmi.update [选项] <名称> ...\n其中 <名称> 是要删除的介质名...\n"
 
 #: ../urpmi.update:43
 #, c-format
@@ -2796,9 +2671,9 @@ msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
 msgstr "  --probe-rpms   - 不使用综合文件，直接使用 rpm 文件\n"
 
 #: ../urpmi.update:50
-#, fuzzy, c-format
+#, c-format
 msgid "  -a             - select all enabled non-removable media.\n"
-msgstr "  -a             - 选择所有不可移动的介质。\n"
+msgstr "  -a  - 选择所有不可移动的介质\n\n"
 
 #: ../urpmi.update:51
 #, c-format
@@ -2825,9 +2700,7 @@ msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
-msgstr ""
-"找不到要升级的项\n"
-"(%s 中之一)\n"
+msgstr "找不到要升级的项\n(%s 中之一)\n"
 
 #: ../urpmi.update:98
 #, c-format
@@ -2847,8 +2720,8 @@ msgstr "启用介质 %s"
 #: ../urpmq:44
 #, c-format
 msgid ""
-"  --searchmedia  - use only the given media to search requested (or updated) "
-"packages.\n"
+"  --searchmedia  - use only the given media to search requested (or updated)"
+" packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
 #: ../urpmq:49
@@ -2861,9 +2734,7 @@ msgstr "  --auto-orphans - 列出孤立软件包\n"
 msgid ""
 "  --not-available\n"
 "                 - list installed packages not available on any media.\n"
-msgstr ""
-"  --not-available\n"
-"                 - 列出已安装但却不在任何介质中的软件包。\n"
+msgstr "  --not-available\n                 - 列出已安装但却不在任何介质中的软件包。\n"
 
 #: ../urpmq:53
 #, c-format
@@ -2897,8 +2768,7 @@ msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
 #: ../urpmq:61
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
 #: ../urpmq:62
@@ -2907,9 +2777,9 @@ msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
 #: ../urpmq:63
-#, fuzzy, c-format
+#, c-format
 msgid "  --sources      - print source URLs of selected packages\n"
-msgstr "  --sourcerpm    - 打印源 rpm 名称。\n"
+msgstr "  --sources    - 打印选中包的源地址\n"
 
 #: ../urpmq:65
 #, c-format
@@ -2949,9 +2819,9 @@ msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - 打印 requires 标签。\n"
 
 #: ../urpmq:84
-#, fuzzy, c-format
+#, c-format
 msgid "  --recommends   - print recommends.\n"
-msgstr "  --requires     - 打印 requires 标签。\n"
+msgstr ""
 
 #: ../urpmq:85
 #, c-format
@@ -2968,9 +2838,7 @@ msgstr "  --summary, -S  - 打印摘要。\n"
 msgid ""
 "  --requires-recursive, -d\n"
 "                   - query package dependencies.\n"
-msgstr ""
-"  --requires-recursive, -d\n"
-"                   - 查询软件包依赖关系。\n"
+msgstr "  --requires-recursive, -d\n                   - 查询软件包依赖关系。\n"
 
 #: ../urpmq:90
 #, c-format
@@ -2982,18 +2850,14 @@ msgstr "  --whatrequires - 逆序搜索需要软件包的软件包。\n"
 msgid ""
 "  --whatrequires-recursive\n"
 "                   - extended reverse search (includes virtual packages).\n"
-msgstr ""
-"  --whatrequires-recursive\n"
-"                   - 扩展逆序搜索(包括虚拟软件包)。\n"
+msgstr "  --whatrequires-recursive\n                   - 扩展逆序搜索(包括虚拟软件包)。\n"
 
 #: ../urpmq:93
 #, c-format
 msgid ""
 "  --whatprovides, -p\n"
 "                   - search in provides to find package.\n"
-msgstr ""
-"  --whatprovides, -p\n"
-"                   - 允许在 provides 中寻找软件包。\n"
+msgstr "  --whatprovides, -p\n                   - 允许在 provides 中寻找软件包。\n"
 
 #: ../urpmq:96
 #, c-format
@@ -3079,14 +2943,12 @@ msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结�
 
 #: ../urpmq:419
 #, c-format
-msgid ""
-"no xml info for medium \"%s\", unable to return any result for package %s"
+msgid "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
 #: ../urpmq:420
 #, c-format
-msgid ""
-"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
 #: ../urpmq:487
@@ -3104,253 +2966,8 @@ msgstr "图形化安装 RPM 软件包"
 
 #: ../polkit/org.mageia.gurpmi2.policy.in.h:1
 msgid "Run Mageia Package Installer"
-msgstr ""
+msgstr "运行Mageia包安装器"
 
 #: ../polkit/org.mageia.gurpmi2.policy.in.h:2
 msgid "Authentication is required to run Mageia Package Installer"
-msgstr ""
-
-#~ msgid "(suggested)"
-#~ msgstr "(建议安装)"
-
-#~ msgid "  --suggests     - suggests tags\n"
-#~ msgstr "  --suggests     - suggests 标签\n"
-
-#~ msgid "  --suggests     - print suggests.\n"
-#~ msgstr "  --suggests     - 打印 suggests 标签。\n"
-
-#~ msgid "(%d package, %d MB)"
-#~ msgid_plural "(%d packages, %d MB)"
-#~ msgstr[0] "(%d 个软件包，%d MB)"
-
-#~ msgid "[repackaging]"
-#~ msgstr "[重新打包]"
-
-#~ msgid "curl failed: upload canceled\n"
-#~ msgstr "curl 失败: 上传已取消\n"
-
-#~ msgid "  --repackage    - Re-package the files before erasing\n"
-#~ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
-
-#~ msgid "  --checkpoint   - set repackaging start now\n"
-#~ msgstr "  --checkpoint   - 设定重新打包立即开始\n"
-
-#, fuzzy
-#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-#~ msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
-
-#~ msgid ""
-#~ "  --list         - list transactions since provided date/duration "
-#~ "argument\n"
-#~ msgstr "  --list         - 列出自所提供日期/时长参数之后的交易\n"
-
-#, fuzzy
-#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-#~ msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
-
-#~ msgid "  --list-safe    - list transactions since checkpoint\n"
-#~ msgstr "  --list-safe    - 列出自检查点之后的交易\n"
-
-#~ msgid ""
-#~ "  --rollback     - rollback until specified date,\n"
-#~ "                   or rollback the specified number of transactions\n"
-#~ msgstr "  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
-
-#, fuzzy
-#~ msgid "  --disable      - turn off repackaging\n"
-#~ msgstr "  --fiename      - 软件包文件名\n"
-
-#, fuzzy
-#~ msgid "Invalid date or duration [%s]\n"
-#~ msgstr "目录 %s 的所有者无效"
-
-#, fuzzy
-#~ msgid "Repackage directory not defined\n"
-#~ msgstr "未找到软件包 %s。"
-
-#, fuzzy
-#~ msgid "Can't write to repackage directory [%s]\n"
-#~ msgstr "创建目录 %s 失败"
-
-#, fuzzy
-#~ msgid "Cleaning up repackage directory [%s]...\n"
-#~ msgstr "创建目录 %s 失败"
-
-#~ msgid "%d file removed\n"
-#~ msgid_plural "%d files removed\n"
-#~ msgstr[0] "删除了 %d 个文件\n"
-
-#~ msgid "Spurious command-line arguments [%s]\n"
-#~ msgstr "冲突的命令行参数[%s]\n"
-
-#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
-#~ msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
-
-#~ msgid "You can't specify --checkpoint and --list at the same time\n"
-#~ msgstr "您不能同时指定 --checkpoint 和 --list\n"
-
-#~ msgid "You can't specify --rollback and --list at the same time\n"
-#~ msgstr "您不能同时指定 --rollback 和 --list\n"
-
-#~ msgid "You can't specify --disable along with another option"
-#~ msgstr "您不能将 --disable 与其它选项一起使用"
-
-#~ msgid "No transaction found since %s\n"
-#~ msgstr "自 %s 后无交易\n"
-
-#~ msgid "You must be superuser to do this"
-#~ msgstr "您必须是超级用户才能执行此操作"
-
-#, fuzzy
-#~ msgid "Writing rpm macros file [%s]...\n"
-#~ msgstr "正在获取 rpm 文件[%s]..."
-
-#, fuzzy
-#~ msgid "No rollback date found\n"
-#~ msgstr "没有找到更新日志\n"
-
-#~ msgid "Rollback until %s...\n"
-#~ msgstr "回滚至 %s...\n"
-
-#, fuzzy
-#~ msgid "Disabling repackaging\n"
-#~ msgstr "[重新打包]"
-
-#~ msgid ""
-#~ "urpme version %s\n"
-#~ "%s\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage:\n"
-#~ msgstr ""
-#~ "urpmf 版本 %s\n"
-#~ "%s\n"
-#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
-#~ "\n"
-#~ "用法:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "urpmf version %s\n"
-#~ "%s\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage: urpmf [options] pattern-expression\n"
-#~ msgstr ""
-#~ "urpmf 版本 %s\n"
-#~ "版权 (C) 2002-2006 Mandriva。\n"
-#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
-#~ "\n"
-#~ "用法:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "urpmi.recover version %s\n"
-#~ "%s\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage:\n"
-#~ msgstr ""
-#~ "urpmq 版本 %s\n"
-#~ "版权 (C) 2000-2006 Mandriva。\n"
-#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
-#~ "\n"
-#~ "用法:\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "urpmq version %s\n"
-#~ "%s\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage:\n"
-#~ msgstr ""
-#~ "urpmq 版本 %s\n"
-#~ "版权 (C) 2000-2006 Mandriva。\n"
-#~ "这是自由软件，可以依照 GNU GPL 重新发布。\n"
-#~ "\n"
-#~ "用法:\n"
-
-#~ msgid ""
-#~ "Installation failed, some files are missing:\n"
-#~ "%s\n"
-#~ "You may want to update your urpmi database"
-#~ msgstr ""
-#~ "安装失败，缺少下列文件:\n"
-#~ "%s\n"
-#~ "您可能需要更新您的 urpmi 数据库"
-
-#, fuzzy
-#~ msgid ""
-#~ "# Here are logs of your DUDF uploads.\n"
-#~ "# Line format is : <date time of generation> <uid>\n"
-#~ "# You can use uids to see the content of your uploads at this url :\n"
-#~ "# %s"
-#~ msgstr ""
-#~ "# 这是您 DUDF 上传的日志。\n"
-#~ "# 每一行的格式都是: <生成的时间> <uid>\n"
-#~ "# 您可以在下面的网站使用 uid 查看您上传的内容:\n"
-#~ "# http://dudf.forge.mandriva.com/"
-
-#~ msgid "curl is missing, cannot upload DUDF file.\n"
-#~ msgstr "缺少 curl，无法上传 DUDF 文件。\n"
-
-#~ msgid "Compressing DUDF data... "
-#~ msgstr "正在压缩 DUDF 数据..."
-
-#~ msgid "NOT OK\n"
-#~ msgstr "不正常\n"
-
-#~ msgid "OK\n"
-#~ msgstr "正常\n"
-
-#~ msgid "Uploading DUDF data:\n"
-#~ msgstr "上传 DUDF 数据:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "You can see your DUDF report at the following URL :\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "您可以在下列 URL 查看您的 DUDF 报告:\n"
-#~ "\t"
-
-#~ msgid ""
-#~ "You can access a log of your uploads in\n"
-#~ "\t"
-#~ msgstr ""
-#~ "您可以在下面的地址查看您的上传日志\n"
-#~ "\t"
-
-#~ msgid ""
-#~ "A problem has been encountered. You can help Mandriva to improve package\n"
-#~ "installation by uploading a DUDF report file.\n"
-#~ "This is a part of the Mancoosi european research project.\n"
-#~ "More at http://www.mancoosi.org\n"
-#~ msgstr ""
-#~ "发生了问题。要帮助 Mandriva 改进软件包安装，您可以上传 DUDF 报告文件。\n"
-#~ "这是 Mancoosi 欧洲研究计划的一部分。\n"
-#~ "更多内容请看 http://www.mancoosi.org\n"
-
-#~ msgid "Do you want to upload a DUDF report to Mandriva?"
-#~ msgstr "您是否想要将 DUDF 报告上传到 Mandriva 吗?"
-
-#~ msgid ""
-#~ "\n"
-#~ "Generating DUDF... "
-#~ msgstr ""
-#~ "\n"
-#~ "正在生成 DUDF..."
-
-#~ msgid "Cannot write DUDF file.\n"
-#~ msgstr "无法写入 DUDF 文件。\n"
-
-#~ msgid ""
-#~ "  --sources      - give all source packages before downloading (root "
-#~ "only).\n"
-#~ msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
+msgstr "需要授权才能打开Mageia包安装器"