Update Chinese (Simplified) translation from Tx

1 files changed, 223 insertions, 80 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4766edcb..0615ac37 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,22 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2000
 # 7rack <vimxiang@gmail.com>, 2014
 # zhangmin <zm1990s@gmail.com>, 2014
+# zwpwjwtz <zwpwjwtz@126.com>, 2016
 # 汤诗语 <shiyu@mandriva.org>, 2003,2008
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "POT-Creation-Date: 2014-09-13 21:15+0200\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"
+"PO-Revision-Date: 2016-05-13 07:16+0000\n"
+"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/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: 8-bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../gurpm/RPMProgressDialog.pm:47
@@ -93,10 +95,19 @@ 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
@@ -106,7 +117,12 @@ msgid ""
 "%s\n"
 "\n"
 "Proceed?"
-msgstr "您即将在您的计算机上安装下列软件包:\n\n%s\n\n继续吗?"
+msgstr ""
+"您即将在您的计算机上安装下列软件包:\n"
+"\n"
+"%s\n"
+"\n"
+"继续吗?"
 
 #: ../gurpmi:98
 #, c-format
@@ -116,7 +132,12 @@ 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
@@ -178,7 +199,9 @@ 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
@@ -233,7 +256,9 @@ msgstr "准备安装软件包..."
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s"
-msgstr "某些要求的软件包无法安装:\n%s"
+msgstr ""
+"某些要求的软件包无法安装:\n"
+"%s"
 
 #: ../gurpmi2:99
 #, c-format
@@ -241,7 +266,10 @@ 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
@@ -279,7 +307,10 @@ 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
@@ -339,7 +370,9 @@ msgstr "完成(_D)"
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s"
-msgstr "安装失败，缺少某些文件:\n%s"
+msgstr ""
+"安装失败，缺少某些文件:\n"
+"%s"
 
 #: ../gurpmi2:339
 #, c-format
@@ -371,7 +404,9 @@ 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
@@ -548,10 +583,16 @@ 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
@@ -856,14 +897,19 @@ 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
@@ -979,9 +1025,11 @@ 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
 #, c-format
@@ -991,12 +1039,12 @@ msgstr "忽略非自由介质 `%s'"
 #: ../urpm/media.pm:795
 #, c-format
 msgid "un-ignoring non-free medium `%s' b/c nonfree packages are installed"
-msgstr ""
+msgstr "取消忽略 non-free 介质“%s”，因为已安装 nonfree 软件包"
 
 #: ../urpm/media.pm:799
 #, c-format
 msgid "un-ignoring tainted medium `%s' b/c tainted packages are installed"
-msgstr ""
+msgstr "取消忽略 tainted 介质“%s”，因为已安装 tainted 软件包"
 
 #: ../urpm/media.pm:827
 #, c-format
@@ -1334,7 +1382,10 @@ msgid_plural ""
 "The following packages:\n"
 "%s\n"
 "are now orphaned."
-msgstr[0] "下列包\n%s\n现在已是孤儿包"
+msgstr[0] ""
+"下列包\n"
+"%s\n"
+"现在已是孤儿包"
 
 #: ../urpm/orphans.pm:530
 #, c-format
@@ -1347,12 +1398,17 @@ msgstr[0] "你可以移除它们"
 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
@@ -1407,8 +1463,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
@@ -1492,14 +1548,18 @@ 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
@@ -1627,7 +1687,9 @@ 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
@@ -1919,7 +1981,7 @@ msgstr "  --sourcerpm    - 源 rpm 名称\n"
 #: ../urpmf:75
 #, c-format
 msgid "  --recommends   - recommends tags\n"
-msgstr ""
+msgstr " --recommends - 推荐的标签\n"
 
 #: ../urpmf:76
 #, c-format
@@ -1994,7 +2056,7 @@ msgstr "  --auto-orphans - 不询问直接删除孤立软件包\n"
 #: ../urpmi:80 ../urpmq:52
 #, c-format
 msgid "  --no-recommends - do not auto select \"recommended\" packages.\n"
-msgstr ""
+msgstr " --no-recommends - 不自动选择“推荐的”软件包\n"
 
 #: ../urpmi:81
 #, c-format
@@ -2013,7 +2075,8 @@ 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
@@ -2021,7 +2084,9 @@ 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
@@ -2058,7 +2123,9 @@ msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 msgid ""
 "  --downgrade    - downgrade a package from the version currently installed\n"
 "                   to the previously highest version\n"
-msgstr "--降级- 将一个已安装的包降低到此版本\n之前最新的版本\n"
+msgstr ""
+"--降级- 将一个已安装的包降低到此版本\n"
+"之前最新的版本\n"
 
 #: ../urpmi:99
 #, c-format
@@ -2083,14 +2150,16 @@ msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖�
 #: ../urpmi:105
 #, c-format
 msgid "  --allow-recommends - auto select \"recommended\" packages.\n"
-msgstr ""
+msgstr " --allow-recommends - 自动选择“推荐的”软件包。\n"
 
 #: ../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
@@ -2109,7 +2178,9 @@ 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
@@ -2146,28 +2217,36 @@ 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
@@ -2214,7 +2293,8 @@ 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
@@ -2296,7 +2376,9 @@ 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
@@ -2340,7 +2422,9 @@ 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
@@ -2348,14 +2432,18 @@ 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
@@ -2367,7 +2455,9 @@ msgstr "(是(Y)/否(n))[是]"
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
-msgstr "某些要求的软件包无法安装:\n%s"
+msgstr ""
+"某些要求的软件包无法安装:\n"
+"%s"
 
 #: ../urpmi:526
 #, c-format
@@ -2380,7 +2470,9 @@ 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
@@ -2388,7 +2480,9 @@ 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
@@ -2398,9 +2492,12 @@ msgstr "(只是测试，删除将不会实际发生)"
 #: ../urpmi:563
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
+"%s\n"
+msgstr ""
+"您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
-msgstr "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n%s\n"
 
 #: ../urpmi:573
 #, c-format
@@ -2423,10 +2520,8 @@ 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
 #, c-format
 msgid ""
@@ -2449,7 +2544,26 @@ msgid ""
 "\n"
 "\n"
 "and [options] are from\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"
+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"
+"\n"
+"urpmi.addmedia --distrib --mirrorlist '$MIRRORLIST'\n"
+"urpmi.addmedia --mirrorlist '$MIRRORLIST' backports media/main/backports\n"
+"urpmi.addmedia --distrib --zeroconf\n"
+"\n"
+"\n"
+"而 [选项] 可以来自\n"
 
 #: ../urpmi.addmedia:56 ../urpmi.update:33 ../urpmq:71
 #, c-format
@@ -2476,14 +2590,20 @@ 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
@@ -2587,7 +2707,9 @@ 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
@@ -2609,7 +2731,9 @@ 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
@@ -2636,14 +2760,18 @@ 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
@@ -2673,7 +2801,9 @@ msgstr "  --probe-rpms   - 不使用综合文件，直接使用 rpm 文件\n"
 #: ../urpmi.update:50
 #, c-format
 msgid "  -a             - select all enabled non-removable media.\n"
-msgstr "  -a  - 选择所有不可移动的介质\n\n"
+msgstr ""
+"  -a  - 选择所有不可移动的介质\n"
+"\n"
 
 #: ../urpmi.update:51
 #, c-format
@@ -2700,7 +2830,9 @@ 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
@@ -2720,8 +2852,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
@@ -2734,7 +2866,9 @@ 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
@@ -2768,7 +2902,8 @@ 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
@@ -2821,7 +2956,7 @@ msgstr "  --requires     - 打印 requires 标签。\n"
 #: ../urpmq:84
 #, c-format
 msgid "  --recommends   - print recommends.\n"
-msgstr ""
+msgstr " --recommends - 打印命令。\n"
 
 #: ../urpmq:85
 #, c-format
@@ -2838,7 +2973,9 @@ 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
@@ -2850,14 +2987,18 @@ 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
@@ -2943,12 +3084,14 @@ 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