Update string catalogs after string tweaks

This also pulls in some early translations we had entered in Transifex
in the last day so those would not be lost. The diffstat is huge and not
very telling as usual, as all sorts of fuzzyness switches happened this
time around for some reason.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 119 insertions, 269 deletions

diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index a2b58c3c..23a2b87c 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -2,16 +2,16 @@
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
 #
-#   <rainofchaos@gmail.com>, 2011
-# leonfeng <rainofchaos@gmail.com>, 2011
-# 甘 露 <rhythm.gan@gmail.com>, 2011
+#   <rainofchaos@gmail.com>, 2011.
+# leonfeng <rainofchaos@gmail.com>, 2011.
+# 甘 露 <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: 2011-08-08 17:07-0500\n"
-"PO-Revision-Date: 2011-06-04 02:50+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2011-08-09 15:51-0500\n"
+"PO-Revision-Date: 2011-08-08 22:38+0000\n"
+"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/"
 "archlinux-pacman/team/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -29,9 +29,8 @@ msgstr "错误："
 msgid "Cleaning up..."
 msgstr "正在清理..."
 
-#, fuzzy
 msgid "Entering %s environment..."
-msgstr "正在进入 fakeroot 环境..."
+msgstr ""
 
 msgid "Unable to find source file %s."
 msgstr "无法找到源文件 %s。"
@@ -105,19 +104,16 @@ msgstr "完整性检查 (%s) 与源阵列大小不一致。"
 msgid "Integrity checks are missing."
 msgstr "完整性检查 (%s) 缺失。"
 
-#, fuzzy
 msgid "Verifying source file signatures with %s..."
-msgstr "正在验证源代码文件 %s..."
+msgstr ""
 
-#, fuzzy
 msgid "SIGNATURE NOT FOUND"
-msgstr "未找到"
+msgstr ""
 
-#, fuzzy
 msgid "SOURCE FILE NOT FOUND"
-msgstr "未找到"
+msgstr ""
 
-msgid "Warning: Unknown public key"
+msgid "Unknown public key"
 msgstr ""
 
 msgid "Warning: the key has been revoked."
@@ -138,9 +134,8 @@ msgstr ""
 msgid "Please make sure you really trust them."
 msgstr ""
 
-#, fuzzy
 msgid "Skipping all source file integrity checks."
-msgstr "正在跳过完整性检查。"
+msgstr ""
 
 msgid "Skipping verification of source file checksums."
 msgstr ""
@@ -169,9 +164,8 @@ msgstr "正在清理安装..."
 msgid "Removing doc files..."
 msgstr "正在删除 doc 文件..."
 
-#, fuzzy
 msgid "Purging unwanted files..."
-msgstr "正在清除其他文件..."
+msgstr ""
 
 msgid "Compressing man and info pages..."
 msgstr "正在压缩 man 及 info 文档..."
@@ -179,24 +173,20 @@ msgstr "正在压缩 man 及 info 文档..."
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr "正在从二进制文件和库中清除不需要的系统符号..."
 
-#, fuzzy
 msgid "Removing %s files..."
-msgstr "正在删除 doc 文件..."
+msgstr ""
 
 msgid "Removing empty directories..."
 msgstr "正在删除空目录..."
 
-#, fuzzy
 msgid "Compressing binaries with %s..."
-msgstr "正在压缩 man 及 info 文档..."
+msgstr ""
 
-#, fuzzy
 msgid "Could not compress binary : %s"
-msgstr "无法访问缓存目录 %s\n"
+msgstr ""
 
-#, fuzzy
 msgid "Generating %s file..."
-msgstr "正在生成 .PKGINFO 文件..."
+msgstr ""
 
 msgid "Cannot find library listed in %s: %s"
 msgstr ""
@@ -204,20 +194,17 @@ msgstr ""
 msgid "Please add a license line to your %s!"
 msgstr "请添加软件许可证行到你的 %s！"
 
-#, fuzzy
 msgid "Example for GPL'ed software: %s."
-msgstr "GPL 软件的列子：license=('GPL')"
+msgstr ""
 
-#, fuzzy
 msgid "%s entry file not in package : %s"
-msgstr "备份条目文件不在软件包中：%s"
+msgstr ""
 
 msgid "Package contains reference to %s"
 msgstr "软件包提及含有 %s"
 
-#, fuzzy
 msgid "Missing %s directory."
-msgstr "缺少 pkg/ 目录。"
+msgstr ""
 
 msgid "Creating package..."
 msgstr "正在创建软件包..."
@@ -237,17 +224,14 @@ msgstr "无法创建软件包文件。"
 msgid "Failed to create symlink to package file."
 msgstr "创建软件包文件系统链接失败。"
 
-#, fuzzy
 msgid "Signing package..."
-msgstr "正在创建软件包..."
+msgstr ""
 
-#, fuzzy
 msgid "Created signature file %s."
-msgstr "正在生成更新的数据库文件 '%s'"
+msgstr ""
 
-#, fuzzy
 msgid "Failed to sign package file."
-msgstr "无法创建软件包文件。"
+msgstr ""
 
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
@@ -267,13 +251,11 @@ msgstr "创建源码包文件失败。"
 msgid "Failed to create symlink to source package file."
 msgstr "无法创建源软件包文件的系统链接。"
 
-#, fuzzy
 msgid "Installing package %s with %s..."
-msgstr "正在安装软件包 %s (使用 %s  -U )..."
+msgstr ""
 
-#, fuzzy
 msgid "Installing %s package group with %s..."
-msgstr "正在安装软件包组 %s (使用 %s  -U )..."
+msgstr ""
 
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
@@ -284,13 +266,11 @@ msgstr "%s 不允许为空。"
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s 不允许以连字号开始。"
 
-#, fuzzy
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr "%s 不允许含有冒号( : )或连字号( - )。"
+msgstr ""
 
-#, fuzzy
 msgid "%s is not allowed to contain hyphens or whitespace."
-msgstr "%s 不允许含有连字号 (减号) "
+msgstr ""
 
 msgid "%s must be an integer."
 msgstr "%s 必须是个整数。"
@@ -301,36 +281,29 @@ msgstr "%s 不具备 '%s' 架构。"
 msgid "Note that many packages may need a line added to their %s"
 msgstr "注意许多软件包可能需要在 %s 中添加"
 
-#, fuzzy
 msgid "such as %s."
-msgstr "类似 arch=('%s') 的一行."
+msgstr ""
 
-#, fuzzy
 msgid "%s array cannot contain comparison (< or >) operators."
-msgstr "提供不能含有 (< 或 >)比较操作符的阵列"
+msgstr ""
 
-#, fuzzy
 msgid "%s entry should not contain leading slash : %s"
-msgstr "备份条目不能包含前置斜杠号：%s"
+msgstr ""
 
-#, fuzzy
 msgid "Invalid syntax for %s : '%s'"
-msgstr "无效的 optdepend 语法： '%s'"
+msgstr ""
 
 msgid "%s file (%s) does not exist."
 msgstr "%s 文件 (%s) 不存在。"
 
-#, fuzzy
 msgid "%s array contains unknown option '%s'"
-msgstr "选项组含有未知的选项 '%s'"
+msgstr ""
 
-#, fuzzy
 msgid "Missing %s function for split package '%s'"
-msgstr "拆分软件包 '%s' 缺少软件包功能"
+msgstr ""
 
-#, fuzzy
 msgid "Requested package %s is not provided in %s"
-msgstr "提供所需求的软件包 %s，在 %s 里没有"
+msgstr ""
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
 msgstr "Sudo 命令没有找到。将使用 su 获取根用户特权。"
@@ -359,9 +332,8 @@ msgstr ""
 msgid "Cannot find the %s binary required for object file stripping."
 msgstr ""
 
-#, fuzzy
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr "正在压缩 man 及 info 文档..."
+msgstr ""
 
 msgid "Cannot find the %s binary required to determine latest %s revision."
 msgstr ""
@@ -378,9 +350,8 @@ msgstr "用法：%s [选项]"
 msgid "Options:"
 msgstr "选项："
 
-#, fuzzy
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
-msgstr "  -A, --ignorearch 忽略 %s 中的不完整的架构段"
+msgstr ""
 
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      编译后清理工作文件"
@@ -388,9 +359,8 @@ msgstr "  -c, --clean      编译后清理工作文件"
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
-#, fuzzy
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr "  -e, --noextract  不解压缩源码文件 (使用现存的 src/ 目录) "
+msgstr ""
 
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆盖现存的软件包"
@@ -398,9 +368,8 @@ msgstr "  -f, --force      覆盖现存的软件包"
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
 
-#, fuzzy
 msgid "  -h, --help       Show this help message and exit"
-msgstr "  -h, --help       获得帮助"
+msgstr ""
 
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    成功编译后安装软件包"
@@ -424,22 +393,19 @@ msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
-#, fuzzy
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
-msgstr "  -s, --syncdeps   使用 pacman 安装缺少的依赖关系"
+msgstr ""
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "    --allsource     只生成源码包 (包括有已下载的源码) "
 
-#, fuzzy
 msgid "  --asroot         Allow %s to run as root user"
-msgstr "      --asroot     允许 makepkg 作为根用户运行"
+msgstr ""
 
-#, fuzzy
 msgid "  --check          Run the %s function in the %s"
-msgstr "  --check          在 %s 中运行 check() 功能"
+msgstr ""
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <文件> 使用替代的配置文件 (而不是 '%s')"
@@ -448,45 +414,38 @@ msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr "  --holdver        防止开发 %ss 的自动版本碰撞"
 
-#, fuzzy
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
-#, fuzzy
 msgid "  --nocheck        Do not run the %s function in the %s"
-msgstr "  --nocheck          不在 %s 中运行 check() 功能"
+msgstr ""
 
-#, fuzzy
 msgid "  --nosign         Do not create a signature for the package"
-msgstr "      --needed         不重新安装已经为最新的软件包\n"
+msgstr ""
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <清单>     仅从分割软件包中创建清单中所列的软件包"
 
-#, fuzzy
 msgid "  --sign           Sign the resulting package with %s"
-msgstr "      --needed         不重新安装已经为最新的软件包\n"
+msgstr ""
 
-#, fuzzy
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
+msgstr ""
 
-#, fuzzy
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr "  --skipinteg      如缺少完整性检查值也继续"
+msgstr ""
 
-msgid "  --skippgpcheck   Do not verify source files with pgp signatures"
+msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr ""
 
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
 msgstr "  --source         只生成源码包 (不包括已下载的源码) "
 
-#, fuzzy
 msgid "These options can be passed to %s:"
-msgstr "这些选项可以传递给 pacman："
+msgstr ""
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
@@ -495,9 +454,8 @@ msgstr "   --noconfirm      当解决依赖关系时不询问确认"
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  下载文件时不显示进度条"
 
-#, fuzzy
 msgid "If %s is not specified, %s will look for '%s'"
-msgstr "如果没有指定 -p ，makepkg将寻找 '%s'"
+msgstr ""
 
 msgid ""
 "Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
@@ -512,9 +470,8 @@ msgstr ""
 msgid "%s not found."
 msgstr "%s 未找到。"
 
-#, fuzzy
 msgid "You do not have write permission to create packages in %s."
-msgstr "你没有写入权限来保存软件包到 %s。"
+msgstr ""
 
 msgid "You do not have write permission to store packages in %s."
 msgstr "你没有写入权限来保存软件包到 %s。"
@@ -522,55 +479,37 @@ msgstr "你没有写入权限来保存软件包到 %s。"
 msgid "You do not have write permission to store downloads in %s."
 msgstr "你没有权限将下载数据写入 %s。"
 
-#, fuzzy
 msgid "\\0%s and %s cannot both be specified"
-msgstr "\\0--holdver 和 --forcever 不能同时指定。"
-
-#, fuzzy
-msgid "Running %s as root is a BAD idea and can cause"
-msgstr "以 root (根用户) 身份运行 makepkg 的习惯很不好，"
-
-msgid "permanent, catastrophic damage to your system. If you"
-msgstr "可能会造成你的系统永久性、灾难性的损坏；"
-
-#, fuzzy
-msgid "wish to run as root, please use the %s option."
-msgstr "如果你希望以 root (根用户) 来运行，请使用 --asroot 选项。"
-
-#, fuzzy
-msgid "The %s option is meant for the root user only."
-msgstr "--asroot 选项仅针对 root (根用户) 。"
-
-#, fuzzy
-msgid "Please rerun %s without the %s flag."
-msgstr "请不带 --asroot 参数再运行一次 makepkg。"
+msgstr ""
 
-#, fuzzy
-msgid "Running %s as an unprivileged user will result in non-root"
-msgstr "以非授权用户身份运行 makepkg 将导致"
+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 ""
 
-#, fuzzy
-msgid "ownership of the packaged files. Try using the %s environment by"
-msgstr "打包文件的拥有者权限为非根用户。请尝试"
+msgid ""
+"The %s option is meant for the root user only. Please\\nrerun %s without the "
+"%s flag."
+msgstr ""
 
-#, fuzzy
-msgid "placing %s in the %s array in %s."
-msgstr "正在 %s内的 BUILDENV 中加入 'fakeroot' 。"
+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 ""
 
-#, fuzzy
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr "不要使用 '-F' 选项。该选项仅供 makepkg 使用。"
+msgstr ""
 
 msgid "%s does not exist."
 msgstr "%s 不存在。"
 
-#, fuzzy
 msgid "%s contains %s characters and cannot be sourced."
-msgstr "%s 包含 CRLF 字符，无法取源。"
+msgstr ""
 
-#, fuzzy
 msgid "The key %s does not exist in your keyring."
-msgstr "%s 不存在或不是一个目录。"
+msgstr ""
 
 msgid "There is no key in your keyring."
 msgstr ""
@@ -578,29 +517,24 @@ msgstr ""
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现有的软件包..."
 
-#, fuzzy
 msgid "A package has already been built. (use %s to overwrite)"
-msgstr "已有一个编译好的软件包。 (使用 -f 覆盖) "
+msgstr ""
 
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr "已有一个编译好的软件包组，正在安装现有的软件包..."
 
-#, fuzzy
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr "已有一个编译好的软件包组。 (使用 -f 覆盖) "
+msgstr ""
 
-#, fuzzy
 msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr "一部分软件包组已经编译完毕。 (使用 -f 覆盖) "
+msgstr ""
 
-#, fuzzy
 msgid "Leaving %s environment."
-msgstr "正在退出 fakeroot 环境。"
+msgstr ""
 
-#, fuzzy
 msgid "Repackaging without the use of a %s function is deprecated."
-msgstr "不使用 package() 功能来打包已经不再使用。"
+msgstr ""
 
 msgid "File permissions may not be preserved."
 msgstr "文件权限无法保留。"
@@ -608,9 +542,8 @@ msgstr "文件权限无法保留。"
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
-#, fuzzy
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr "已有一个编译好的源软件包。 (使用 -f 覆盖) "
+msgstr ""
 
 msgid "Source package created: %s"
 msgstr "源代码包已创建：%s"
@@ -627,21 +560,17 @@ msgstr "正在检查编译时依赖关系"
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
-#, fuzzy
 msgid "%s was not found in %s; skipping dependency checks."
-msgstr "没有在 PATH 中找到 %s；正在跳过依赖关系检查。"
+msgstr ""
 
-#, fuzzy
 msgid "Skipping source retrieval        -- using existing %s tree"
-msgstr "跳过源码获取        -- 使用现有的 src/ 目录树"
+msgstr ""
 
-#, fuzzy
 msgid "Skipping source integrity checks -- using existing %s tree"
-msgstr "跳过源码完整性检查 -- 使用现有的 src/ 目录树"
+msgstr ""
 
-#, fuzzy
 msgid "Skipping source extraction       -- using existing %s tree"
-msgstr "跳过源码解压缩       -- 使用现有的 src/ 目录树"
+msgstr ""
 
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "源代码目录为空，没有东西可编译。"
@@ -652,9 +581,8 @@ msgstr "软件包目录为空，没有东西可重新打包。"
 msgid "Sources are ready."
 msgstr "源代码已就绪。"
 
-#, fuzzy
 msgid "Removing existing %s directory..."
-msgstr "正在删除现有的 pkg/ 目录..."
+msgstr ""
 
 msgid "Finished making: %s"
 msgstr "完成创建：%s"
@@ -691,58 +619,51 @@ msgstr "完成。"
 msgid "Manage pacman's list of trusted keys"
 msgstr ""
 
-#, fuzzy
 msgid "  -a, --add [<file(s)>]     Add the specified keys (empty for stdin)"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
-#, fuzzy
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
-#, fuzzy
 msgid "  -e, --export [<keyid(s)>] Export the specified or all keyids"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
 msgid ""
 "  -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids"
 msgstr ""
 
-#, fuzzy
 msgid "  -h, --help                Show this help message and exit"
-msgstr "  -h, --help       获得帮助"
+msgstr ""
 
-#, fuzzy
 msgid "  -l, --list-keys [<keyid(s)>] List the specified or all keys"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
-#, fuzzy
 msgid "  -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
 msgstr ""
 
-#, fuzzy
 msgid "  -v, --verify <signature>  Verify the file specified by the signature"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
 msgid "  -V, --version             Show program version"
 msgstr ""
 
 #, fuzzy
-msgid "  --config <file>           Use an alternate config file"
+msgid ""
+"  --config <file>           Use an alternate config file (instead of"
+"\\n                            '%s')"
 msgstr "  --config <文件> 使用替代的配置文件 (而不是 '%s')"
 
-msgid "                                    (instead of '%s')"
-msgstr ""
-
 msgid ""
 "  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
 msgstr ""
 
-#, fuzzy
-msgid "  --gpgdir <dir>            Set an alternate directory for gnupg"
-msgstr "  -p <文件> 使用另外的编译脚本 (而不是 '%s' ) "
+msgid ""
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
+"\\n                            of '%s')"
+msgstr ""
 
 msgid ""
 "  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
@@ -762,54 +683,44 @@ msgstr ""
 msgid "  --reload                  Reload the default keys"
 msgstr ""
 
-#, fuzzy
 msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "你没有写入权限来保存软件包到 %s。"
+msgstr ""
 
 msgid "Use '%s' to correct the keyring permissions."
 msgstr ""
 
-#, fuzzy
 msgid "You do not have sufficient permissions to run this command..."
-msgstr "你没有写入权限来保存软件包到 %s。"
+msgstr ""
 
-#, fuzzy
 msgid "Verifying official keys file signature..."
-msgstr "正在把数据库放置到位..."
+msgstr ""
 
-#, fuzzy
 msgid "The signature of file %s is not valid."
-msgstr "正在生成更新的数据库文件 '%s'"
+msgstr ""
 
-#, fuzzy
 msgid "Verifying deprecated keys file signature..."
-msgstr "正在把数据库放置到位..."
+msgstr ""
 
-#, fuzzy
 msgid "Verifying deleted keys file signature..."
-msgstr "正在把数据库放置到位..."
+msgstr ""
 
-#, fuzzy
 msgid "Appending official keys..."
-msgstr "正在添加 %s 文件..."
+msgstr ""
 
 msgid "Appending deprecated keys..."
 msgstr ""
 
-#, fuzzy
 msgid "Removing deleted keys from keyring..."
-msgstr "正在删除空目录..."
+msgstr ""
 
-#, fuzzy
 msgid "Updating trust database..."
-msgstr "正在同步数据库到磁盘..."
+msgstr ""
 
 msgid "You need to specify the keyserver and at least one key identifier"
 msgstr ""
 
-#, fuzzy
 msgid "The key identified by %s does not exist"
-msgstr "%s 文件 (%s) 不存在。"
+msgstr ""
 
 msgid "Cannot find the %s binary required for all %s operations."
 msgstr ""
@@ -818,7 +729,7 @@ msgid "%s needs to be run as root for this operation."
 msgstr ""
 
 #, fuzzy
-msgid "%s configuation file '%s' not found."
+msgid "%s configuration file '%s' not found."
 msgstr "软件库文件 '%s' 未找到"
 
 msgid "no operation specified (use -h for help)"
@@ -855,9 +766,8 @@ msgstr "diff 工具未找到，请安装 diffutils。"
 msgid "You must have correct permissions to optimize the database."
 msgstr "你必须拥有相应的权限才能优化数据库。"
 
-#, fuzzy
 msgid "Can not create temp directory for database building."
-msgstr "无法为建立数据库而创建临时目录。"
+msgstr ""
 
 msgid "MD5sum'ing the old database..."
 msgstr "正在为原数据库创建 MD5 校验值..."
@@ -937,9 +847,8 @@ msgstr "文件 '%s' 不存在"
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"
 
-#, fuzzy
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr "用法：repo-add [-d] [-f] [-q] <数据库路径> <软件包|增量包> ...\\n"
+msgstr ""
 
 msgid ""
 "repo-add will update a package database by reading a package file."
@@ -948,20 +857,17 @@ msgstr ""
 "repo-add 通过读取一个软件包文件来更新软件包数据库。\\n可以在命令行中指定添加"
 "多个软件包\\n\\n"
 
-#, fuzzy
 msgid "Options:\\n"
-msgstr "选项："
+msgstr ""
 
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 
-#, fuzzy
 msgid "  -f, --files       update database's file list\\n"
-msgstr "使用 -f/--files 参数以更新包括文件条目的某个数据库。\\n\\n"
+msgstr ""
 
-#, fuzzy
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
-msgstr "用法：repo-remove·[-q]·<path-to-db>·<软件包名|delta增量包>·...\\n\\n"
+msgstr ""
 
 msgid ""
 "repo-remove will update a package database by removing the package name"
@@ -977,9 +883,8 @@ msgstr ""
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr ""
 
-#, fuzzy
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+msgstr ""
 
 msgid "  -v, --verify      verify database's signature before update\\n"
 msgstr ""
@@ -989,22 +894,18 @@ msgid ""
 "\\n"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "Example:  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.pkg.tar.gz"
+msgstr ""
 
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "例子：  repo-remove /path/to/repo.db.tar.gz kernel26"
 
-#, fuzzy
 msgid ""
 "Copyright (c) 2006-2011 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) 2010-2011 Pacman 开发团队 <pacman-dev@archlinux.org>.\\n本程序是"
-"自由软件；请参阅版权条款。\\n没有任何担保，在法律允许的范围内。\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "没有软件包 '%s' 的数据库条目。"
@@ -1016,20 +917,17 @@ msgid "Removing existing entry '%s'..."
 msgstr "正在删除现有的条目 '%s'..."
 
 #, fuzzy
-msgid "Cannot find the gpg binary! Is gnupg installed?"
+msgid "Cannot find the gpg binary! Is GnuPG installed?"
 msgstr "无法找到 xdelta 执行文件！是否已安装 xdelta3？"
 
-#, fuzzy
 msgid "Signing database..."
-msgstr "正在同步数据库到磁盘..."
+msgstr ""
 
-#, fuzzy
 msgid "Failed to sign package database."
-msgstr "无法创建软件包文件。"
+msgstr ""
 
-#, fuzzy
 msgid "Verifying database signature..."
-msgstr "正在把数据库放置到位..."
+msgstr ""
 
 msgid "No existing signature found, skipping verification."
 msgstr ""
@@ -1043,9 +941,8 @@ msgstr ""
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' 未包含有效的压缩包扩展名。"
 
-#, fuzzy
 msgid "Computing checksums..."
-msgstr "正在计算 md5 校验值..."
+msgstr ""
 
 msgid "An entry for '%s' already existed"
 msgstr "已存在条目 '%s'"
@@ -1119,52 +1016,5 @@ msgstr ""
 msgid "unrecognized option"
 msgstr ""
 
-#~ msgid "Cannot find openssl."
-#~ msgstr "无法找到 openssl。"
-
-#~ msgid "Removing libtool .la files..."
-#~ msgstr "正在删除 libtool .la 文件..."
-
-#~ msgid "  -C, --cleancache Clean up source files from the cache"
-#~ msgstr "  -C, --cleancache 从缓存中清理源码文件"
-
-#~ msgid "Cleaning up ALL files from %s."
-#~ msgstr "正在从 %s 中清理所有文件。"
-
-#~ msgid "    Are you sure you wish to do this? "
-#~ msgstr "    你确认要这样做吗？ "
-
-#~ msgid "[y/N]"
-#~ msgstr "[y/N]"
-
-#~ msgid "YES"
-#~ msgstr "是"
-
-#~ msgid "Y"
-#~ msgstr "Y"
-
-#~ msgid "Problem removing files; you may not have correct permissions in %s"
-#~ msgstr "删除文件发生错误；你可能没有 %s 的相关权限。"
-
-#~ msgid "Source cache cleaned."
-#~ msgstr "源代码缓存已清除。"
-
-#~ msgid "No files have been removed."
-#~ msgstr "没有文件被删除。"
-
-#~ msgid "Source destination must be defined in %s."
-#~ msgstr "必须在 %s 中指定源码目标地。"
-
-#~ msgid "In addition, please run makepkg -C outside of your cache directory."
-#~ msgstr "此外，请在你的缓存目录外运行 makepkg -C。"
-
-#, fuzzy
-#~ msgid "Usage: %s [options] <command> [arguments]"
-#~ msgstr "用法：%s [选项]"
-
-#, fuzzy
-#~ msgid "Executing: %s "
-#~ msgstr "正在解压缩 %s，使用 %s"
-
-#~ msgid "ERROR: Can not create temp directory for database building."
-#~ msgstr "错误：无法为建立数据库而创建临时目录。"
+#~ msgid "permanent, catastrophic damage to your system. If you"
+#~ msgstr "可能会造成你的系统永久性、灾难性的损坏；"