Merge commit 'xavier/trans'

1 files changed, 77 insertions, 99 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a2ff4cbd..5d87fcca 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2009-07-28 07:00-0500\n"
-"PO-Revision-Date: 2009-01-03 20:19+0700\n"
+"PO-Revision-Date: 2009-07-30 20:25+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -50,11 +50,11 @@ msgstr "正在检查软件包完整性...\n"
 
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "正在检查 delta 增量包完整性...\n"
+msgstr "正在检查增量包完整性...\n"
 
 #, c-format
 msgid "applying deltas...\n"
-msgstr "正在应用 deltas 增量包...\n"
+msgstr "正在应用增量包...\n"
 
 #, c-format
 msgid "generating %s with %s... "
@@ -85,17 +85,19 @@ msgstr ":: 用 %2$s/%3$s 替代 %1$s？"
 msgid ":: %s conflicts with %s. Remove %s?"
 msgstr ":: %1$s 与 %2$s 有冲突。删除 %3$s？"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 ":: the following package(s) cannot be upgraded due to unresolvable "
 "dependencies:\n"
-msgstr ":: 下列软件包应当首先更新：\n"
+msgstr ":: 由于无法解决依赖关系，下列软件包无法更新：\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Do you want to skip the above package(s) for this upgrade?"
-msgstr "打算从缓存中删除所有软件包吗？"
+msgstr ""
+"\n"
+"你打算更新时跳过上述软件包吗？"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway?"
@@ -273,11 +275,11 @@ msgstr "'%s' 没有可获得的更新日志。\n"
 msgid "options"
 msgstr "选项"
 
-#, fuzzy, c-format
+#, c-format
 msgid "file(s)"
 msgstr "文件"
 
-#, fuzzy, c-format
+#, c-format
 msgid "package(s)"
 msgstr "软件包"
 
@@ -349,14 +351,14 @@ msgstr "  -f,  -force          强制安装，覆盖存在冲突的文件\n"
 msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr "  -c, --changelog      查看某软件包的更新日志\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr "  -d, --deps           列出所有作为依赖关系安装的软件包\n"
+msgstr "  -d, --deps           列出所有作为依赖关系安装的软件包 [过滤器]\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr "  -e, --explicit       列出所有单独指定安装的软件包\n"
+msgstr "  -e, --explicit       列出所有单独指定安装的软件包 [过滤器]\n"
 
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
@@ -371,17 +373,18 @@ msgstr "  -i, --info           查看软件包信息（-ii 查看备份文件）
 msgid ""
 "  -k, --check          check that the files owned by the package(s) are "
 "present\n"
-msgstr ""
+msgstr "  -k, --check          检查拥有该文件的软件包是否存在\n"
 
 #, c-format
 msgid "  -l, --list           list the contents of the queried package\n"
 msgstr "  -l, --list           列出被查询软件包的内容\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr "  -m, --foreign        列出没有在同步数据库时找到的已安装软件包\n"
+msgstr ""
+"  -m, --foreign        列出没有在同步数据库时找到的已安装软件包 [过滤器]\n"
 
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
@@ -397,14 +400,14 @@ msgid ""
 "strings\n"
 msgstr "  -s, --search <regex> 搜寻符合指定字符串的已安装本地的软件包\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -t, --unrequired     list packages not required by any package [filter]\n"
-msgstr "  -t, --unrequired     列出所有不被其他软件包要求的软件包\n"
+msgstr "  -t, --unrequired     列出所有不被其他软件包要求的软件包 [过滤器]\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr "  -u, --upgrades       列出所有可升级的软件包\n"
+msgstr "  -u, --upgrades       列出所有可升级的软件包 [过滤器]\n"
 
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
@@ -435,11 +438,11 @@ msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex表达式> 按照指定字符串查询远端软件仓库\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade all outdated packages (-uu enables "
 "downgrade)\n"
-msgstr "  -u, --sysupgrade     升级所有过期软件包\n"
+msgstr "  -u, --sysupgrade     升级所有过期软件包 (-uu 启用降级)\n"
 
 #, c-format
 msgid ""
@@ -496,9 +499,9 @@ msgstr "      --noscriptlet    不执行安装小脚本\n"
 msgid "  -v, --verbose        be verbose\n"
 msgstr "  -v, --verbose        循环执行\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "      --debug          display debug messages\n"
-msgstr "      --needed         不重新安装已经为最新的软件包\n"
+msgstr "      -- debug        显示除错信息\n"
 
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
@@ -570,7 +573,7 @@ msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n"
 
 #, c-format
 msgid "invalid value for 'CleanMethod' : '%s'\n"
-msgstr "为 'CleanMethod' 设置的无效值： '%s'\n"
+msgstr "'CleanMethod' 设置的为无效值： '%s'\n"
 
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
@@ -622,11 +625,11 @@ msgstr "未找到 \"%s\" 组\n"
 
 #, c-format
 msgid "root path too long\n"
-msgstr ""
+msgstr "根路径过长\n"
 
 #, c-format
 msgid "file path too long\n"
-msgstr ""
+msgstr "文件路径过长\n"
 
 #, c-format
 msgid "no usable package repositories configured.\n"
@@ -668,13 +671,13 @@ msgstr "无法准备事务处理 (%s)\n"
 msgid ":: %s: requires %s\n"
 msgstr ":: %1$s: 要求 %2$s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is designated as a HoldPkg.\n"
-msgstr ":: %s 被指定为 HoldPkg（保留软件包）。确定要删除吗？"
+msgstr "%s 被指定为 HoldPkg（保留软件包）。\n"
 
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
+msgstr "在目标清单中发现 HoldPkg 指定的软件包。你确定要继续吗？"
 
 #, c-format
 msgid "Do you want to remove these packages?"
@@ -720,9 +723,9 @@ msgstr "打算从缓存中删除未安装的软件包吗？"
 msgid "Do you want to remove outdated packages from cache?"
 msgstr "打算从缓存中删除过期的软件包吗？"
 
-#, fuzzy, c-format
+#, c-format
 msgid "removing old packages from cache...\n"
-msgstr "正在从缓存中删除旧软件包..."
+msgstr "正在从缓存中删除旧软件包...\n"
 
 #, c-format
 msgid "could not access cache directory\n"
@@ -730,15 +733,15 @@ msgstr "无法访问缓存目录\n"
 
 #, c-format
 msgid "File %s does not seem to be a valid package, remove it?"
-msgstr ""
+msgstr "文件 %s 不像是个有效的软件包，删除它吗？"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to remove ALL files from cache?"
-msgstr "打算从缓存中删除所有软件包吗？"
+msgstr "打算从缓存中删除所有文件吗？"
 
-#, fuzzy, c-format
+#, c-format
 msgid "removing all files from cache...\n"
-msgstr "正在从缓存中删除所有软件包..."
+msgstr "正在从缓存中删除所有文件...\n"
 
 #, c-format
 msgid "could not remove cache directory\n"
@@ -780,9 +783,9 @@ msgstr "软件仓库 \"%s\" 未找到\n"
 msgid ":: Starting full system upgrade...\n"
 msgstr ":: 正在进行全面系统更新...\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "skipping target: %s\n"
-msgstr "正在创建软件包：%s"
+msgstr "正在跳过软件包：%s\n"
 
 #, c-format
 msgid "%s package not found, searching for group...\n"
@@ -814,7 +817,7 @@ msgstr "本地数据库已是最新的\n"
 
 #, c-format
 msgid "no database for package: %s\n"
-msgstr ""
+msgstr "无软件包的数据库：%s\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -1048,13 +1051,11 @@ msgstr "失败"
 msgid "One or more files did not pass the validity check!"
 msgstr "一个或多个文件没有通过有效性检查！"
 
-#, fuzzy
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr "完整性检查 (%s) 缺失或者不完整"
+msgstr "完整性检查 (%s) 与源阵列大小不一致。"
 
-#, fuzzy
 msgid "Integrity checks are missing."
-msgstr "完整性检查 (%s) 缺失或者不完整"
+msgstr "完整性检查 (%s) 缺失。"
 
 msgid "Extracting Sources..."
 msgstr "解压缩源码..."
@@ -1071,27 +1072,23 @@ msgstr "正在开始 build()..."
 msgid "Build Failed."
 msgstr "创建失败。"
 
-#, fuzzy
 msgid "Starting %s()..."
-msgstr "正在开始 build()..."
+msgstr "正在开始 %s()..."
 
-#, fuzzy
 msgid "Packaging Failed."
-msgstr "创建失败。"
+msgstr "打包失败。"
 
 msgid "Tidying install..."
 msgstr "正在清理安装..."
 
-#, fuzzy
 msgid "Removing doc files..."
-msgstr "正在删除 info/doc 文件..."
+msgstr "正在删除 doc 文件..."
 
 msgid "Purging other files..."
-msgstr ""
+msgstr "正在清除其他文件..."
 
-#, fuzzy
 msgid "Compressing man and info pages..."
-msgstr "正在压缩 man 文档..."
+msgstr "正在压缩 man 及 info 文档..."
 
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "正在从二进制文件和库中清除 debug 符号..."
@@ -1147,16 +1144,14 @@ msgstr "正在压缩源码包..."
 msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
-#, fuzzy
 msgid "Failed to install built package(s)."
-msgstr "无法创建软件包文件。"
+msgstr "安装创建的软件包失败。"
 
 msgid "%s is not allowed to be empty."
 msgstr "%s 不允许为空。"
 
-#, fuzzy
 msgid "%s is not allowed to start with a hyphen."
-msgstr "%s 不允许含有连字号（减号）"
+msgstr "%s 不允许以连字号开始。"
 
 msgid "%s is not allowed to contain hyphens."
 msgstr "%s 不允许含有连字号（减号）"
@@ -1180,7 +1175,7 @@ msgid "options array contains unknown option '%s'"
 msgstr "选项组含有未知的选项 '%s'"
 
 msgid "missing package function for split package '%s'"
-msgstr ""
+msgstr "拆分软件包 '%s' 缺少软件包功能"
 
 msgid "Determining latest darcs revision..."
 msgstr "正在确认最新的 darcs 修正..."
@@ -1264,9 +1259,8 @@ msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
-#, fuzzy
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr "  -R, --repackage  不编译而重新打包 pkg/ 内容"
+msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   使用 pacman 安装缺少的依赖关系"
@@ -1303,16 +1297,15 @@ msgstr "      --noprogressbar  下载时不显示进度条"
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "如果没有指定 -p ，makepkg将寻找 '%s'"
 
-#, fuzzy
 msgid ""
 "Copyright (c) 2006-2009 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 Aaron Griffin <aaron@archlinux.org>.\\nCopyright·(c)·2007-"
-"2008·Dan·McGee·<dan@archlinux.org>.\\n\\n这是一个自由软件；版权条款见源码。"
-"\\n在法律许可下，不承担任何担保责任。\\n"
+"Copyright (C) 2006-2009 Pacman 开发小组 <pacman-dev@archlinux.org>."
+"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n这是一个自"
+"由软件；版权条款见源码。\\n在法律许可下，不承担任何担保责任。\\n"
 
 msgid "%s not found."
 msgstr "%s 未找到。"
@@ -1335,9 +1328,8 @@ msgstr "源代码缓存已清除。"
 msgid "No files have been removed."
 msgstr "没有文件被删除。"
 
-#, fuzzy
 msgid "Source destination must be defined in %s."
-msgstr "必须在 makepkg.conf 中指定源码目标地。"
+msgstr "必须在 %s 中指定源码目标地。"
 
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr "此外，请在你的缓存目录外运行 makepkg -C。"
@@ -1369,9 +1361,8 @@ msgstr "以非授权用户身份运行 makepkg 将导致"
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr "打包文件的拥有者权限为非根用户。请尝试"
 
-#, fuzzy
 msgid "placing 'fakeroot' in the BUILDENV array in %s."
-msgstr "在 makepkg.conf 的 BUILDENV 中加入 'fakeroot' 来使用 fakeroot 环境。"
+msgstr "正在 %s内的 BUILDENV 中加入 'fakeroot' 。"
 
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "不要使用 '-F' 选项。该选项仅供 makepkg 使用。"
@@ -1389,7 +1380,7 @@ msgid "%s does not exist."
 msgstr "%s 不存在。"
 
 msgid "%s contains CRLF characters and cannot be sourced."
-msgstr ""
+msgstr "%s 包含 CRLF 字符，无法取源。"
 
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
@@ -1397,18 +1388,15 @@ msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "已有一个编译好的软件包。（使用 -f 覆盖）"
 
-#, fuzzy
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
+msgstr "已有一个编译好的软件包组，正在安装现有的软件包..."
 
-#, fuzzy
 msgid "The package group has already been built. (use -f to overwrite)"
-msgstr "已有一个编译好的软件包。（使用 -f 覆盖）"
+msgstr "已有一个编译好的软件包组。（使用 -f 覆盖）"
 
-#, fuzzy
 msgid "Part of the package group has already been built. (use -f to overwrite)"
-msgstr "已有一个编译好的软件包。（使用 -f 覆盖）"
+msgstr "一部分软件包组已经编译完毕。（使用 -f 覆盖）"
 
 msgid "Leaving fakeroot environment."
 msgstr "正在退出 fakeroot 环境。"
@@ -1528,13 +1516,11 @@ msgstr "正在把数据库放置到位..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "完毕。你的 pacman 数据库已经优化。"
 
-#, fuzzy
 msgid "Usage: repo-add [-q] <path-to-db> <package|delta> ...\\n"
-msgstr "用法：repo-add·[-q]·<path-to-db>·<package>·...\\n"
+msgstr "用法：repo-add·[-q]·<path-to-db>·<软件包|delta增量包>·...\\n"
 
-#, fuzzy
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
-msgstr "用法：repo-remove·[-q]·<path-to-db>·<packagename>·...\\n\\n"
+msgstr "用法：repo-remove·[-q]·<path-to-db>·<软件包名|delta增量包>·...\\n\\n"
 
 msgid ""
 "repo-add will update a package database by reading a package file."
@@ -1554,7 +1540,7 @@ msgstr ""
 msgid ""
 "Use the -q/--quiet flag to minimize output to basic messages, warnings,"
 "\\nand errors\\n\\n"
-msgstr ""
+msgstr "使用 -q/--quiet 参数可只输出最基本的信息，警告，\\n及错误信息\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "例子：  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
@@ -1573,14 +1559,13 @@ msgstr ""
 "\\n在法律许可下，不承担任何担保责任。\\n"
 
 msgid "Creating 'deltas' db entry..."
-msgstr "正在生成 'deltas' 数据库记录..."
+msgstr "正在生成 '增量包' 数据库记录..."
 
 msgid "An entry for '%s' already existed"
-msgstr ""
+msgstr "已存在条目 '%s'"
 
-#, fuzzy
 msgid "Removing existing entry '%s'..."
-msgstr "正在删除现有的软件包 '%s'..."
+msgstr "正在删除现有的条目 '%s'..."
 
 msgid "Invalid package file '%s'."
 msgstr "无效的软件包文件 '%s'。"
@@ -1594,12 +1579,11 @@ msgstr "正在计算 md5 校验值..."
 msgid "Creating 'depends' db entry..."
 msgstr "正在生成 'depends' 数据库记录..."
 
-#, fuzzy
 msgid "Failed to acquire lockfile: %s."
-msgstr "无法创建软件包文件。"
+msgstr "无法要求锁定文件：%s。"
 
 msgid "Held by %s"
-msgstr ""
+msgstr "保留由 %s"
 
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "库文件 '%s' 不是一个有效的 pacman 数据库。"
@@ -1610,21 +1594,17 @@ msgstr "正在解压缩数据库到一个临时目录..."
 msgid "Repository file '%s' was not found."
 msgstr "软件仓库文件 '%s' 未找到"
 
-#, fuzzy
 msgid "Repository file '%s' could not be created."
-msgstr "配置文件 %s 无法读取。\n"
+msgstr "库文件 %s 无法创建。"
 
-#, fuzzy
 msgid "File '%s' not found."
-msgstr "软件包 '%s' 未找到。"
+msgstr "文件 '%s' 未找到。"
 
-#, fuzzy
 msgid "Adding delta '%s'"
-msgstr "已添加 delta '%s'"
+msgstr "正在添加增量包 '%s'"
 
-#, fuzzy
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-msgstr "无法找到 xdelta 执行文件！xdelta 是否已安装？"
+msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"
 
 msgid "'%s' is not a package file, skipping"
 msgstr "'%s' 不是一个软件包文件，跳过"
@@ -1632,13 +1612,11 @@ msgstr "'%s' 不是一个软件包文件，跳过"
 msgid "Adding package '%s'"
 msgstr "正在添加软件包 '%s'"
 
-#, fuzzy
 msgid "Searching for delta '%s'..."
-msgstr "正在搜索软件包 '%s'..."
+msgstr "正在搜索增量包 '%s'..."
 
-#, fuzzy
 msgid "Delta matching '%s' not found."
-msgstr "未找到符合 '%s' 的软件包。"
+msgstr "未找到符合 '%s' 的增量包。"
 
 msgid "Searching for package '%s'..."
 msgstr "正在搜索软件包 '%s'..."