Merge branch 'maint'

Conflicts:
	lib/libalpm/sync.c
	src/util/pactree.c

1 files changed, 39 insertions, 53 deletions

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index 4fc83638..c5cef4e3 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -10,9 +10,9 @@ 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-01-30 21:40-0600\n"
-"PO-Revision-Date: 2012-01-05 23:01+0000\n"
-"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
+"POT-Creation-Date: 2012-02-02 00:05-0600\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/team/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -458,16 +458,15 @@ msgstr "  --noprogressbar  下载文件时不显示进度条"
 msgid "If %s is not specified, %s will look for '%s'"
 msgstr "如果没有指定 %s，%s 将寻找 '%s'"
 
-#, fuzzy
 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 ""
-"版权所有 (c) 2006-2011 Pacman 开发团队 <pacman-dev@archlinux.org>.\\n版权所"
-"有 (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自由软件；请"
-"参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
+"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 信号。退出中..."
@@ -490,6 +489,9 @@ msgstr "你没有写入权限来保存软件包到 %s。"
 msgid "You do not have write permission to store downloads in %s."
 msgstr "你没有权限将下载数据写入 %s。"
 
+msgid "You do not have write permission to store source tarballs in %s."
+msgstr "您没有在 %s 内保存源码包所需的写入权限。"
+
 msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s 和 %s 不能同时指定。"
 
@@ -605,14 +607,13 @@ msgstr "完成创建：%s"
 msgid "Usage: %s [pacman_db_root]"
 msgstr "用法：%s [pacman_db_root]"
 
-#, fuzzy
 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 ""
-"版权所有 (c) 2010-2011 Pacman 开发团队 <pacman-dev@archlinux.org>.\\n本程序是"
-"自由软件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
+"Copyright (c) 2010-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
+"是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s 不存在或不是一个目录。"
@@ -715,9 +716,8 @@ msgid ""
 "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 msgstr "  --refresh-keys [keyid(s)] 从密匙服务器中更新指定的或所有的密匙"
 
-#, fuzzy
 msgid "The key identified by %s could not be found locally."
-msgstr "由 %s 认证的密匙不存在。"
+msgstr "本地没有找到由 %s 认定的密匙。"
 
 msgid "You do not have sufficient permissions to read the %s keyring."
 msgstr "您没有足够的许可权来读取 %s 密匙环。"
@@ -771,56 +771,49 @@ msgid "Disabling key %s..."
 msgstr "正在禁用密匙 %s..."
 
 msgid "A specified keyfile could not be added to the gpg keychain."
-msgstr ""
+msgstr "指定密匙文件无法加入到 gpg 密匙链。"
 
 msgid "A specified key could not be removed from the gpg keychain."
-msgstr ""
+msgstr "指定密匙文件无法从 gpg 密匙链中移除。"
 
-#, fuzzy
 msgid "The key identified by %s could not be edited."
-msgstr "由 %s 认证的密匙不存在。"
+msgstr "由 %s 认定的密匙不能编辑。"
 
 msgid "A specified key could not be exported from the gpg keychain."
-msgstr ""
+msgstr "指定密匙无法从 gpg 密匙链中导出。"
 
 msgid "The fingerprint of a specified key could not be determined."
-msgstr ""
+msgstr "无法确定指定密匙的指纹。"
 
-#, fuzzy
 msgid "%s could not be imported."
-msgstr "无法创建增量软件包。"
+msgstr "%s 无法导入。"
 
-#, fuzzy
 msgid "File %s does not exist and could not be imported."
-msgstr "%s 不存在或不是一个目录。"
+msgstr "文件 %s 不存在且无法导入。"
 
-#, fuzzy
 msgid "A specified key could not be listed."
-msgstr "库文件 %s 无法创建。"
+msgstr "指定密匙无法列出。"
 
-#, fuzzy
 msgid "A specified signature could not be listed."
-msgstr "一个或多个 PGP 签名无法校验！"
+msgstr "指定签名无法列出。"
 
 msgid "A specified key could not be locally signed."
-msgstr ""
+msgstr "指定密匙无法在本地签署。"
 
 msgid "Remote key not fetched correctly from keyserver."
-msgstr ""
+msgstr "无法从密匙服务器中正确取回远端密匙。"
 
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
+msgstr "指定的本地密匙无法从密匙服务器中更新。"
 
-#, fuzzy
 msgid "The signature identified by %s could not be verified."
-msgstr "由 %s 认证的密匙不存在。"
+msgstr "由 %s 认定的签名无法验证。"
 
 msgid "Updating trust database..."
 msgstr "正在更新可信数据库..."
 
-#, fuzzy
 msgid "Trust database could not be updated."
-msgstr "无法创建增量软件包。"
+msgstr "信任数据库无法更新。"
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr "无法找到所需的 %s 二进制文件以进行所有 %s 操作。"
@@ -949,13 +942,12 @@ msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 msgstr "用法：repo-add [选项] <到数据库路径> <软件包|delta增量包> ...\\n"
 
-#, fuzzy
 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\\n"
+"repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指"
+"定的软件包。\\n"
 
 msgid "Options:\\n"
 msgstr "选项：\\n"
@@ -966,22 +958,19 @@ msgstr "  -d, --delta       生成并添加软件包更新所用的 delta 增量
 msgid "  -f, --files       update database's file list\\n"
 msgstr "  -f, --files       更新数据库的文件列表\\n"
 
-#, fuzzy
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"用法：repo-remove [选项] <到数据库路径> <软件包名|delta 增量包> ...\\n\\n"
+msgstr "用法：repo-remove [选项] <数据库路径> <软件包名|增量包> ...\\n"
 
-#, fuzzy
 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\\n"
+"repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软"
+"件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
 
 msgid "Please move along, there is nothing to see here.\\n"
-msgstr ""
+msgstr "请自便，此处无须人盯。\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
 msgstr "  -q, --quiet       最小化输出信息\\n"
@@ -995,28 +984,25 @@ msgstr "  -k, --key <密匙>   使用指定的密匙签名该数据库\\n"
 msgid "  -v, --verify      verify database's signature before update\\n"
 msgstr "  -v, --verify      更新前验证数据库签名\\n"
 
-#, fuzzy
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr "\\n更多细节及可用选项的描述请参见 %s(8) 。\\n\\n"
+msgstr "\\n更多可用选项的描述及细节请参见 %s(8)。\\n"
 
-#, fuzzy
 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"
+msgstr ""
+"示例：repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
-#, fuzzy
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
-msgstr "例子：  repo-remove /path/to/repo.db.tar.gz kernel26"
+msgstr "示例：repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
-#, fuzzy
 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 ""
-"版权所有 (c) 2006-2011 Pacman 开发小组 <pacman-dev@archlinux.org>\\n\\n自由软"
-"件；复制条件请参见源文件。\\n法律允许范围之下无担保。\\n"
+"Copyright (c) 2006-2012 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
+"是自由软件；版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "没有软件包 '%s' 的数据库条目。"
@@ -1055,7 +1041,7 @@ msgid "An entry for '%s' already existed"
 msgstr "已存在条目 '%s'"
 
 msgid "Invalid package signature file '%s'."
-msgstr ""
+msgstr "无效的软件包签名文件 '%s'。"
 
 msgid "Adding package signature..."
 msgstr "正在添加软件包签名..."