Merge branch 'maint'

Conflicts:
	po/it.po

1 files changed, 101 insertions, 118 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 32a99a29..8727aad7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # Chinese/Simplified translation for Pacman package manager package.
 # Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-# 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008.
+# 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2008, 2009.
 #
 #
 msgid ""
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2009-01-02 22:24-0600\n"
-"PO-Revision-Date: 2008-10-28 16:20+0900\n"
-"Last-Translator: Lyman Li <lymanrb@gmail.com>\n"
+"PO-Revision-Date: 2009-01-03 20:19+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"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -50,11 +50,11 @@ msgstr "正在检查软件包完整性...\n"
 
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "正在检查 delta 完整性...\n"
+msgstr "正在检查 delta 增量包完整性...\n"
 
 #, c-format
 msgid "applying deltas...\n"
-msgstr "正在应用 deltas...\n"
+msgstr "正在应用 deltas 增量包...\n"
 
 #, c-format
 msgid "generating %s with %s... "
@@ -73,16 +73,12 @@ msgid ":: Retrieving packages from %s...\n"
 msgstr ":: 正在从 %s 软件仓库获取软件包...\n"
 
 #, c-format
-msgid ""
-":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-":: %s 需要安装位于 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中的 %s。"
-"一律安装吗?[Y/n]"
+msgid ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
+msgstr ":: %s 需要安装位于 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中的 %s。一律安装吗?[Y/n]"
 
 #, c-format
 msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-":: %s 位于 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中。确定要安装吗?"
+msgstr ":: %s 位于 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中。确定要安装吗?"
 
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway?"
@@ -301,8 +297,7 @@ msgstr ""
 "使用 '%s {-h --help}' 及某个操作以查看可得的选项\n"
 
 #, c-format
-msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgid "  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr "  -c, --cascade        删除软件包及所有的依赖于此的软件包\n"
 
 #, c-format
@@ -310,8 +305,7 @@ msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         略过依赖关系检查\n"
 
 #, c-format
-msgid ""
-"  -k, --dbonly         only remove database entry, do not remove files\n"
+msgid "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr "  -k, --dbonly         只删除数据库记录，不删除文件\n"
 
 #, c-format
@@ -327,10 +321,8 @@ msgstr ""
 "                       (-ss·也包括单独指定安装的依赖关系)\n"
 
 #, c-format
-msgid ""
-"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
-msgstr ""
-"  -u, --unneeded       同时删除不需要的（且不会破坏其他软件包的）依赖关系\n"
+msgid "  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgstr "  -u, --unneeded       同时删除不需要的（且不会破坏其他软件包的）依赖关系\n"
 
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
@@ -361,8 +353,7 @@ msgid "  -g, --groups         view all members of a package group\n"
 msgstr "  -g, --groups         查看某软件包组所属的所有软件包\n"
 
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "  -i, --info           查看软件包信息（-ii 查看备份文件）\n"
 
 #, c-format
@@ -370,8 +361,7 @@ msgid "  -l, --list           list the contents of the queried package\n"
 msgstr "  -l, --list           列出被查询软件包的内容\n"
 
 #, c-format
-msgid ""
-"  -m, --foreign        list installed packages not found in sync db(s)\n"
+msgid "  -m, --foreign        list installed packages not found in sync db(s)\n"
 msgstr "  -m, --foreign        列出没有在同步数据库时找到的已安装软件包\n"
 
 #, c-format
@@ -383,9 +373,7 @@ msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
 
 #, c-format
-msgid ""
-"  -s, --search <regex> search locally-installed packages for matching "
-"strings\n"
+msgid "  -s, --search <regex> search locally-installed packages for matching strings\n"
 msgstr "  -s, --search <regex> 搜寻符合指定字符串的已安装本地的软件包\n"
 
 #, c-format
@@ -401,9 +389,7 @@ msgid "  -q, --quiet          show less information for query and search\n"
 msgstr "  -q, --quiet          在查询或搜索时显示较少的信息\n"
 
 #, c-format
-msgid ""
-"  -c, --clean          remove old packages from cache directory (-cc for "
-"all)\n"
+msgid "  -c, --clean          remove old packages from cache directory (-cc for all)\n"
 msgstr "  -c, --clean          从缓存目录中删除旧软件包（-cc 清除所有）\n"
 
 #, c-format
@@ -415,14 +401,11 @@ msgid "  -l, --list <repo>    view a list of packages in a repo\n"
 msgstr "  -l, --list <软件仓库>    查看在该软件仓库中的软件包清单\n"
 
 #, c-format
-msgid ""
-"  -p, --print-uris     print out URIs for given packages and their "
-"dependencies\n"
+msgid "  -p, --print-uris     print out URIs for given packages and their dependencies\n"
 msgstr "  -p, --print-uris     打印指定软件包及依赖关系中的URI\n"
 
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex表达式> 按照指定字符串查询远端软件仓库\n"
 
 #, c-format
@@ -430,14 +413,11 @@ msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
 msgstr "  -u, --sysupgrade     升级所有过期软件包\n"
 
 #, c-format
-msgid ""
-"  -w, --downloadonly   download packages but do not install/upgrade "
-"anything\n"
+msgid "  -w, --downloadonly   download packages but do not install/upgrade anything\n"
 msgstr "  -w, --downloadonly   下载但不安装/升级软件包\n"
 
 #, c-format
-msgid ""
-"  -y, --refresh        download fresh package databases from the server\n"
+msgid "  -y, --refresh        download fresh package databases from the server\n"
 msgstr "  -y, --refresh        从服务器下载新的软件包数据库\n"
 
 #, c-format
@@ -445,9 +425,7 @@ msgid "      --needed         don't reinstall up to date packages\n"
 msgstr "      --needed         不重新安装已经为最新的软件包\n"
 
 #, c-format
-msgid ""
-"      --ignore <pkg>   ignore a package upgrade (can be used more than "
-"once)\n"
+msgid "      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"
 msgstr "      --ignore <软件包>   升级时忽略某个软件包（可多次使用）\n"
 
 #, c-format
@@ -471,13 +449,11 @@ msgid "      --noconfirm      do not ask for any confirmation\n"
 msgstr "      --noconfirm      不询问确认\n"
 
 #, c-format
-msgid ""
-"      --noprogressbar  do not show a progress bar when downloading files\n"
+msgid "      --noprogressbar  do not show a progress bar when downloading files\n"
 msgstr "      --noprogressbar  下载文件时不显示进度条\n"
 
 #, c-format
-msgid ""
-"      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgid "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 msgstr "      --noscriptlet    不执行安装小脚本\n"
 
 #, c-format
@@ -536,9 +512,9 @@ msgstr "配置文件 %s 无法读取。\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "配置文件 %s，第 %d 行：坏的章节名。\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not register '%s' database (%s)\n"
-msgstr "无法登记“本地”数据库 (%s)\n"
+msgstr "无法注册 '%s' 数据库 (%s)\n"
 
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
@@ -556,9 +532,9 @@ msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n"
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "为 'CleanMethod' 设置的无效值： '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr "无法登记“本地”数据库 (%s)\n"
+msgstr "无法添加服务器 URL 到数据库 '%s': %s (%s)\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -1136,13 +1112,13 @@ msgid "Version found: %s"
 msgstr "找到版本：%s"
 
 msgid "requires an argument"
-msgstr ""
+msgstr "需要一个参数"
 
 msgid "unrecognized option"
-msgstr ""
+msgstr "不识别的选项"
 
 msgid "invalid option"
-msgstr ""
+msgstr "无效选项"
 
 msgid "Usage: %s [options]"
 msgstr "用法：%s [选项]"
@@ -1189,8 +1165,7 @@ msgstr "  -o, --nobuild    仅下载和解压缩文件"
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
 msgstr "  -p <buildscript> 使用另外的编译脚本（而不是 '%s' ）"
 
-msgid ""
-"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgid "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
@@ -1199,45 +1174,40 @@ msgstr "  -R, --repackage  不编译而重新打包 pkg/ 内容"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   使用 pacman 安装缺少的依赖关系"
 
-msgid ""
-"      --allsource  Generate a source-only tarball including downloaded "
-"sources"
+msgid "      --allsource  Generate a source-only tarball including downloaded sources"
 msgstr "    --allsource     只生成源码包（包括有已下载的源码）"
 
 msgid "      --asroot     Allow makepkg to run as root user"
 msgstr "      --asroot     允许makepkg作为 root（根用户）运行"
 
-msgid ""
-"      --holdver    Prevent automatic version bumping for development "
-"PKGBUILDs"
+msgid "      --holdver    Prevent automatic version bumping for development PKGBUILDs"
 msgstr "      --holdver    防止开发中的 PKGBUILD 自动更新版本"
 
-msgid ""
-"      --source     Generate a source-only tarball without downloaded sources"
+msgid "      --source     Generate a source-only tarball without downloaded sources"
 msgstr "    --source     只生成源码包（不包括已下载的源码）"
 
 msgid "These options can be passed to pacman:"
 msgstr "这些选项可以传递给 pacman："
 
-msgid ""
-"      --noconfirm      Do not ask for confirmation when resolving "
-"dependencies"
+msgid "      --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "      --noconfirm      当解决依赖关系时不询问确认"
 
-msgid ""
-"      --noprogressbar  Do not show a progress bar when downloading files"
+msgid "      --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "      --noprogressbar  下载时不显示进度条"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "如果没有指定 -p ，makepkg将寻找 '%s'"
 
 msgid ""
-"Copyright (C) 2002-2007 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"
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\n这是自由软件；"
-"版权条款见源码\\n在法律许可下，不承担任何担保责任。\\n"
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\n"
+"这是自由软件；版权条款见源码\\n"
+"在法律许可下，不承担任何担保责任。\\n"
 
 msgid "%s not found."
 msgstr "%s 未找到。"
@@ -1330,7 +1300,7 @@ msgid "such as arch=('%s')."
 msgstr "类似 arch=('%s') 的一行."
 
 msgid "Provides array cannot contain comparison (< or >) operators."
-msgstr ""
+msgstr "提供不能含有 (< 或 >)比较操作符的阵列"
 
 msgid "Install scriptlet (%s) does not exist."
 msgstr "安装小脚本 (%s) 不存在。"
@@ -1405,23 +1375,26 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "用法：%s [pacman_db_root]"
 
 msgid ""
-"pacman-optimize is a little hack that should improve the performance\\nof "
-"pacman when reading/writing to its filesystem-based database.\\n\\n"
+"pacman-optimize is a little hack that should improve the performance\\n"
+"of pacman when reading/writing to its filesystem-based database.\\n"
+"\\n"
 msgstr ""
-"pacman-optimize 是一个小 hack，用于提高 pacman\\n读/写基于文件系统的数据库时"
-"的性能。\\n\\n"
+"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 "
-"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"
+"Because pacman uses many small files to keep track of packages,\\n"
+"there is a tendency for these files to become fragmented over time.\\n"
+"This script attempts to relocate these small files into one\\n"
+"continuous location on your hard drive. The result is that the hard\\n"
+"drive should be able to read them faster, since the hard drive head\\n"
+"does not have to move around the disk as much.\\n"
 msgstr ""
-"因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零碎。"
-"\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘磁头"
-"由于不用再在碟片上移来移去，从而可以读取得更快。\\n"
+"因为 pacman 使用许多小文件来跟踪软件包。\\n"
+"久而久之这些文件有倾向变得零碎。\\n"
+"本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n"
+"结果是硬盘磁头由于不用再在碟片上移来移去，从而可以读取得更快。\\n"
 
 msgid "diff tool was not found, please install diffutils."
 msgstr "diff 工具未找到，请安装 diffutils。"
@@ -1447,16 +1420,14 @@ msgstr "正在打包 %s..."
 msgid "Tar'ing up %s failed."
 msgstr "打包 %s 失败。"
 
-#, fuzzy
 msgid "Making and MD5sum'ing the new database..."
 msgstr "正在生成新数据库及其 MD5 校验值..."
 
 msgid "Untar'ing %s failed."
 msgstr "解包 %s 失败。"
 
-#, fuzzy
 msgid "Syncing database to disk..."
-msgstr ":: 正在同步软件包数据库...\n"
+msgstr "正在同步数据库到磁盘..."
 
 msgid "Checking integrity..."
 msgstr "正在检查完整性..."
@@ -1464,9 +1435,8 @@ msgstr "正在检查完整性..."
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "完整性检查失败，恢复到原数据库。"
 
-#, fuzzy
 msgid "Rotating database into place..."
-msgstr "正在把新的数据库放置到位..."
+msgstr "正在把数据库放置到位..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "完毕。你的 pacman 数据库已经优化。"
@@ -1474,28 +1444,41 @@ msgstr "完毕。你的 pacman 数据库已经优化。"
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
 msgstr "用法：repo-add·[-q]·<path-to-db>·<package>·...\\n"
 
-msgid "Usage: repo-remove [-q] <path-to-db> <packagename> ...\\n\\n"
-msgstr "用法：repo-remove·[-q]·<path-to-db>·<packagename>·...\\n\\n"
+msgid ""
+"Usage: repo-remove [-q] <path-to-db> <packagename> ...\\n"
+"\\n"
+msgstr ""
+"用法：repo-remove·[-q]·<path-to-db>·<packagename>·...\\n"
+"\\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\\n"
+"repo-add will update a package database by reading a package file.\\n"
+"Multiple packages to add can be specified on the command line.\\n"
+"\\n"
 msgstr ""
-"repo-add 通过读取一个软件包文件来更新软件包数据库。\\n可以在命令行中指定添加"
-"多个软件包\\n\\n"
+"repo-add 通过读取一个软件包文件来更新软件包数据库。\\n"
+"可以在命令行中指定添加多个软件包\\n"
+"\\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\\n"
+"repo-remove will update a package database by removing the package name\\n"
+"specified on the command line from the given repo database. Multiple\\n"
+"packages to remove can be specified on the command line.\\n"
+"\\n"
 msgstr ""
-"repo-remove 通过在指定软件包数据库中删除\\n在命令行中指定的软件包名来更新这个"
-"软件包数据库。\\n可以在命令行中指定删除多个软件包。\\n\\n"
+"repo-remove 通过在指定软件包数据库中删除\\n"
+"在命令行中指定的软件包名来更新这个软件包数据库。\\n"
+"可以在命令行中指定删除多个软件包。\\n"
+"\\n"
 
 msgid ""
-"The -q/--quiet flag to either program will force silent running except\\nin "
-"the case of warnings or errors.\\n\\n"
-msgstr "-q/--quiet 强制程序安静运行，\\n除非出现警告或错误。\\n\\n"
+"The -q/--quiet flag to either program will force silent running except\\n"
+"in the case of warnings or errors.\\n"
+"\\n"
+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"
@@ -1504,14 +1487,17 @@ msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "例子：  repo-remove /path/to/repo.db.tar.gz kernel26"
 
 msgid ""
-"Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\nCopyright (c) "
-"2007-2008 Dan McGee <dan@archlinux.org>.\\n\\nThis is free software; see the "
-"source for copying conditions.\\nThere is NO WARRANTY, to the extent "
-"permitted by law.\\n"
+"Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\n"
+"Copyright (c) 2007-2008 Dan McGee <dan@archlinux.org>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There 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 Aaron Griffin <aaron@archlinux.org>.\\n"
+"Copyright·(c)·2007-2008·Dan·McGee·<dan@archlinux.org>.\\n"
+"\\n"
+"这是一个自由软件；版权条款见源码。\\n"
+"在法律许可下，不承担任何担保责任。\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "无效的软件包文件 '%s'。"
@@ -1593,15 +1579,12 @@ msgstr "没有软件包被修改，无事可做。"
 
 #~ msgid "For full benefits of pacman-optimize, run 'sync' now."
 #~ msgstr "为了充分享受到 pacman-optimize 的好处，现在运行 'sync' 吧。"
-
 #~ msgid "New optional dependencies for %s\n"
 #~ msgstr "%s 的新可选依赖\n"
-
 #~ msgid "'%s' is not a valid archive extension."
 #~ msgstr "'%s' 是无效的压缩包扩展名。"
-
 #~ msgid "  --config <config> Use an alternate config file (instead of '%s')"
 #~ msgstr "  --config <config> 使用替代的配置文件（而不是 '%s'）"
-
 #~ msgid "'%s' does not have a valid archive extension."
 #~ msgstr "'%s' 未包含有效的压缩包扩展名。"
+