Pull updated translations from transifex

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 95 insertions, 101 deletions

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index 138dad69..01e5371f 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -1,25 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # leonfeng <rainofchaos@gmail.com>, 2011.
 #   <rainofchaos@gmail.com>, 2011.
+# Yangtse Su <yangtsesu@gmail.com>, 2012.
 # 甘 露 <rhythm.gan@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
-"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2012-02-05 02:05+0000\n"
-"Last-Translator: 甘 露 <rhythm.gan@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=3\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
+"PO-Revision-Date: 2012-11-16 14:29+0000\n"
+"Last-Translator: Yangtse Su <yangtsesu@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/archlinux-pacman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "WARNING:"
 msgstr "警告："
@@ -78,7 +78,8 @@ msgstr "无法下载 %s"
 msgid "Generating checksums for source files..."
 msgstr "正在为源代码文件创建完整性检查值..."
 
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "无法找到生成源文件检验值所需的 %s 库。"
 
 msgid "Invalid integrity algorithm '%s' specified."
@@ -267,6 +268,9 @@ msgstr "%s 不允许为空。"
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s 不允许以连字号开始。"
 
+msgid "%s contains invalid characters: '%s'"
+msgstr "%s 包含无效字符： '%s'"
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s 不允许包含冒号，连字号及空格。"
 
@@ -318,7 +322,8 @@ msgstr "无法找到签名软件包所需的 %s 二进制文件。"
 msgid "Cannot find the %s binary required for verifying source files."
 msgstr "无法找到验证源文件所需的 %s 二进制文件。"
 
-msgid "Cannot find the %s binary required for validating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for validating sourcefile checksums."
 msgstr "无法找到验证源文件校验值所需的 %s 二进制文件。"
 
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -391,7 +396,8 @@ msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -420,7 +426,8 @@ msgid ""
 msgstr "  --holdver        防止开发 %ss 的自动版本碰撞"
 
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "  --key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
 
 msgid "  --nocheck        Do not run the %s function in the %s"
@@ -459,14 +466,12 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr "如果没有指定 %s，%s 将寻找 '%s'"
 
 msgid ""
-"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2012 Pacman 开发小组 <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自"
-"由软件；版权情况请详见源代码。\\"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自由软件；版权情况请详见源代码。\\"
 
 msgid "%s signal caught. Exiting..."
 msgstr "发现 %s 信号。退出中..."
@@ -499,22 +504,18 @@ msgid ""
 "Running %s as root is a BAD idea and can cause permanent,\\ncatastrophic "
 "damage to your system. If you wish to run as root, please\\nuse the %s "
 "option."
-msgstr ""
-"作为根用户运行 %s 是一个糟透了的主意，\\n可能会导致对系统灾难性的损坏。如果您"
-"的确想以根用户\\n身份运行，请使用 %s 选项。"
+msgstr "作为根用户运行 %s 是一个糟透了的主意，\\n可能会导致对系统灾难性的损坏。如果您的确想以根用户\\n身份运行，请使用 %s 选项。"
 
 msgid ""
-"The %s option is meant for the root user only. Please\\nrerun %s without the "
-"%s flag."
+"The %s option is meant for the root user only. Please\\nrerun %s without the"
+" %s flag."
 msgstr "该 %s 选项仅供根用户使用。\\n请重新运行 %s 且无 %s 标志。"
 
 msgid ""
 "Running %s as an unprivileged user will result in non-root\\nownership of "
 "the packaged files. Try using the %s environment by\\nplacing %s in the %s "
 "array in %s."
-msgstr ""
-"作为非特权用户运行会导致软件包文件的\\n非根用户拥有权。请尝试使用 %s 环"
-"境，\\n 可通过放置 %s 于 %s 数组内 (位于 %s 中) 调用。"
+msgstr "作为非特权用户运行会导致软件包文件的\\n非根用户拥有权。请尝试使用 %s 环境，\\n 可通过放置 %s 于 %s 数组内 (位于 %s 中) 调用。"
 
 msgid "Do not use the %s option. This option is only for use by %s."
 msgstr "请不要使用 %s 选项。该选项仅供 %s 使用。"
@@ -544,7 +545,8 @@ msgstr "已有一个编译好的软件包组，正在安装现有的软件包...
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "该软件包组已创建过。(使用 %s 覆盖)"
 
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "软件包组的一部分已经创建过。(使用 %s 覆盖)"
 
 msgid "Leaving %s environment."
@@ -608,12 +610,10 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "用法：%s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
-"是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是一个目录。"
@@ -668,29 +668,25 @@ msgid "  -V, --version             Show program version"
 msgstr "  -V, --version             显示程序版本"
 
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           使用另外的配置文件 (而不是"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           使用另外的配置文件 (而不是\\n                            '%s')"
 
 msgid ""
 "  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
 msgstr "  --edit-key <keyid(s)>     为有关密匙识别号的管理密匙任务提供一个菜单"
 
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            为 GnuPG 设定的另外目录 (而"
-"\\n                            非 '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            为 GnuPG 设定的另外目录 (而\\n                            非 '%s')"
 
 msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr "  --import <目录>         从目录中导入 pubring.gpg"
 
 msgid ""
-"  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
-"(s)"
+"  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in "
+"dir(s)"
 msgstr "  --import-trustdb <目录> 从目录中的 trustdb.gpg 导入拥有者信任值"
 
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -706,11 +702,9 @@ msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
 msgstr "  --lsign-key <keyid>       在本地签名指定的密匙识别号"
 
 msgid ""
-"  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate [keyring(s)]   从 (给定的) 密匙环中重新加载默认密匙"
-"\\n                            (在 '%s' 中)"
+"  --populate [keyring(s)]   Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate [keyring(s)]   从 (给定的) 密匙环中重新加载默认密匙\\n                            (在 '%s' 中)"
 
 msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
@@ -758,17 +752,17 @@ msgstr "正在密匙环中禁用已激活密匙..."
 msgid "Disabling key %s..."
 msgstr "正在禁用密匙 %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
-msgstr "指定密匙文件无法加入到 gpg 密匙链。"
+msgid "A specified keyfile could not be added to the keyring."
+msgstr "指定的键文件无法添加到密钥环。"
 
-msgid "A specified key could not be removed from the gpg keychain."
-msgstr "指定密匙文件无法从 gpg 密匙链中移除。"
+msgid "A specified key could not be removed from the keyring."
+msgstr "无法从密钥环删除指定的键。"
 
 msgid "The key identified by %s could not be edited."
 msgstr "由 %s 认定的密匙不能编辑。"
 
-msgid "A specified key could not be exported from the gpg keychain."
-msgstr "指定密匙无法从 gpg 密匙链中导出。"
+msgid "A specified key could not be exported from the keyring."
+msgstr "无法从密钥环导出指定的键。"
 
 msgid "The fingerprint of a specified key could not be determined."
 msgstr "无法确定指定密匙的指纹。"
@@ -824,21 +818,16 @@ msgstr "请分别加 %s 每个操作运行。"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize 是一个小 hack，用于提高 pacman\\n读/写基于文件系统的数据库时"
-"的性能。\\n\\n"
+msgstr "pacman-optimize 是一个小 hack，用于提高 pacman\\n读/写基于文件系统的数据库时的性能。\\n\\n"
 
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零"
-"碎。\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘"
-"磁头由于不用再在碟片上移来移去，从而可以读取得更快。\\n"
+msgstr "因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零碎。\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘磁头由于不用再在碟片上移来移去，从而可以读取得更快。\\n"
 
 msgid "diff tool was not found, please install diffutils."
 msgstr "diff 工具未找到，请安装 diffutils。"
@@ -879,30 +868,45 @@ msgstr "正在把数据库放置到位..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "完毕。你的 pacman 数据库已经优化。"
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr "用法：pkgdelta [-q] <软件包1> <软件包2>\\n"
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
+msgstr "用法： pkgdelta [options] <package1> <package2>\\n"
 
 msgid ""
 "\tpkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n\\n"
-msgstr ""
-"\tpkgdelta 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添"
-"加到数据库中。\\n\\n"
+msgstr "\tpkgdelta 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添加到数据库中。\\n\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "例子：pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "选项：\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       最小化输出信息\\n"
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr "  --min-pkg-size    生成增量包的最小包大小(字节)\\n"
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr "  --max-delta-size  增量包大小超过包大小的百分比，则增量包将会被丢弃\\n"
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软"
-"件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
+msgstr "版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "无效的软件包文件 '%s'。"
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr "跳过小软件包的增量文件创建：%s - size %s"
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "软件包名称不一致：'%s' 和 '%s'"
 
@@ -918,6 +922,9 @@ msgstr "正在创建从版本 %s 到版本 %s 的增量包"
 msgid "Delta could not be created."
 msgstr "无法创建增量软件包。"
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr "增量包大于最大大小，删除。"
+
 msgid "Generated delta : '%s'"
 msgstr "已创建好增量软件包：'%s'"
 
@@ -931,14 +938,9 @@ msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr "用法：repo-add [选项] <到数据库路径> <软件包|delta增量包> ...\\n"
 
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指"
-"定的软件包。\\n"
-
-msgid "Options:\\n"
-msgstr "选项：\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指定的软件包。\\n"
 
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr "  -d, --delta       生成并添加软件包更新所用的 delta 增量包\\n"
@@ -950,19 +952,14 @@ msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr "用法：repo-remove [选项] <数据库路径> <软件包名|增量包> ...\\n"
 
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软"
-"件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
 
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "请自便，此处无须人盯。\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       最小化输出信息\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign        更新后使用 GnuPG 签名数据库\\n"
 
@@ -978,19 +975,16 @@ msgstr "\\n更多可用选项的描述及细节请参见 %s(8)。\\n"
 
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"示例：repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "示例：repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "示例：repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 msgid ""
-"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
-"是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "没有软件包 '%s' 的数据库条目。"