translation: update pot/po files for pacman in prep for release

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

1 files changed, 299 insertions, 163 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 94558a94..82daea2b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"POT-Creation-Date: 2010-06-04 13:33-0500\n"
 "PO-Revision-Date: 2009-10-18 23:53+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,8 +82,12 @@ msgstr ""
 msgid ":: Replace %s with %s/%s?"
 msgstr ":: 用 %2$s/%3$s 替代 %1$s？"
 
-#, c-format
-msgid ":: %s conflicts with %s. Remove %s?"
+#, fuzzy, c-format
+msgid ":: %s and %s are in conflict. Remove %s?"
+msgstr ":: %1$s 与 %2$s 有冲突。删除 %3$s？"
+
+#, fuzzy, c-format
+msgid ":: %s and %s are in conflict (%s). Remove %s?"
 msgstr ":: %1$s 与 %2$s 有冲突。删除 %3$s？"
 
 #, c-format
@@ -312,9 +317,9 @@ msgstr "  -c, --cascade        删除软件包及所有的依赖于此的软件�
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         略过依赖关系检查\n"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"  -k, --dbonly         only remove database entry, do not remove files\n"
+"  -k, --dbonly         only remove database entries, do not remove files\n"
 msgstr "  -k, --dbonly         只删除数据库记录，不删除文件\n"
 
 #, c-format
@@ -336,6 +341,18 @@ msgstr ""
 "  -u, --unneeded       同时删除不需要的（且不会破坏其他软件包的）依赖关系\n"
 
 #, c-format
+msgid ""
+"      --print          only print the targets instead of performing the "
+"operation\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"      --print-format <string>\n"
+"                       specify how the targets should be printed\n"
+msgstr ""
+
+#, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
 msgstr "      --asdeps         作为非单独指定安装的软件包安装\n"
 
@@ -347,6 +364,12 @@ msgstr "      --asexplicit     作为单独指定安装的软件包安装\n"
 msgid "  -f, --force          force install, overwrite conflicting files\n"
 msgstr "  -f,  -force          强制安装，覆盖存在冲突的文件\n"
 
+#, fuzzy, c-format
+msgid ""
+"  -k, --dbonly         add database entries, do not install or keep existing "
+"files\n"
+msgstr "  -k, --dbonly         只删除数据库记录，不删除文件\n"
+
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
 msgstr "  -c, --changelog      查看某软件包的更新日志\n"
@@ -429,12 +452,6 @@ msgstr "  -l, --list <软件仓库>    查看在该软件仓库中的软件包�
 
 #, c-format
 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"
 msgstr "  -s, --search <regex表达式> 按照指定字符串查询远端软件仓库\n"
 
@@ -472,6 +489,14 @@ msgstr ""
 "      --ignoregroup <软件包组>\n"
 "                         升级时忽略某个软件包组（可多次使用）\n"
 
+#, fuzzy, c-format
+msgid "      --asdeps         mark packages as non-explicitly installed\n"
+msgstr "      --asdeps         作为非单独指定安装的软件包安装\n"
+
+#, fuzzy, c-format
+msgid "      --asexplicit     mark packages as explicitly installed\n"
+msgstr "      --asexplicit     作为单独指定安装的软件包安装\n"
+
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
 msgstr "      --config <路径>  指定另外的配置文件\n"
@@ -514,6 +539,10 @@ msgstr "  -b, --dbpath <路径>  指定另外的数据库位置\n"
 msgid "      --cachedir <dir> set an alternate package cache location\n"
 msgstr "      --cachedir <目录> 指定另外的软件包缓存位置\n"
 
+#, fuzzy, c-format
+msgid "      --arch <arch>    set an alternate architecture\n"
+msgstr "      --config <路径>  指定另外的配置文件\n"
+
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
@@ -554,6 +583,28 @@ msgstr "无法 chdir 到下载目录 %s\n"
 msgid "running XferCommand: fork failed!\n"
 msgstr "正在运行 XferCommand：分支失败！\n"
 
+#, fuzzy, c-format
+msgid "directive '%s' without value not recognized\n"
+msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n"
+
+#, c-format
+msgid "invalid value for 'CleanMethod' : '%s'\n"
+msgstr "'CleanMethod' 设置的为无效值： '%s'\n"
+
+#, fuzzy, c-format
+msgid "directive '%s' with a value not recognized\n"
+msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n"
+
+#, c-format
+msgid ""
+"The mirror '%s' contains the $arch variable, but no Architecture is "
+"defined.\n"
+msgstr ""
+
+#, c-format
+msgid "could not add server URL to database '%s': %s (%s)\n"
+msgstr "无法添加服务器 URL 到数据库 '%s': %s (%s)\n"
+
 #, c-format
 msgid "config file %s could not be read.\n"
 msgstr "配置文件 %s 无法读取。\n"
@@ -574,17 +625,19 @@ msgstr "配置文件 %s，第 %d 行：配置文件中语法错误－缺少关�
 msgid "config file %s, line %d: All directives must belong to a section.\n"
 msgstr "配置文件 %s，第 %d 行：所有的命令必须属于同一章节。\n"
 
-#, c-format
-msgid "config file %s, line %d: directive '%s' not recognized.\n"
+#, fuzzy, c-format
+msgid "config file %s, line %d: directive %s needs a value\n"
 msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n"
 
-#, c-format
-msgid "invalid value for 'CleanMethod' : '%s'\n"
-msgstr "'CleanMethod' 设置的为无效值： '%s'\n"
+#, fuzzy, c-format
+msgid "config file %s, line %d: problem in options section\n"
+msgstr "配置文件 %s，第 %d 行：坏的章节名。\n"
 
-#, c-format
-msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr "无法添加服务器 URL 到数据库 '%s': %s (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"config file %s, line %d: directive '%s' in repository section '%s' not "
+"recognized.\n"
+msgstr "配置文件 %s，第 %d 行：未知命令 '%s'\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -606,6 +659,10 @@ msgstr "没有指定的操作（使用 -h 获取帮助）\n"
 msgid "no file was specified for --owns\n"
 msgstr "错误：没有为 --owns 指定文件\n"
 
+#, fuzzy, c-format
+msgid "failed to find '%s' in PATH: %s\n"
+msgstr "无法读取文件 '%1$s': %2$s\n"
+
 #, c-format
 msgid "failed to read file '%s': %s\n"
 msgstr "无法读取文件 '%1$s': %2$s\n"
@@ -655,29 +712,13 @@ msgid "package \"%s\" not found\n"
 msgstr "软件包 \"%s\" 未找到\n"
 
 #, c-format
-msgid "%s not found, searching for group...\n"
-msgstr "%s 未找到，正在搜索软件包组...\n"
-
-#, c-format
-msgid "'%s': not found in local db\n"
-msgstr "'%s'：没有在本地数据库中找到\n"
-
-#, c-format
-msgid ":: group %s:\n"
-msgstr ":: 组 %s:\n"
-
-#, c-format
-msgid "    Remove whole content?"
-msgstr "    删除全部内容？"
-
-#, c-format
-msgid ":: Remove %s from group %s?"
-msgstr ":: 从组 %2$s 中删除 %1$s 吗？"
-
-#, c-format
 msgid "failed to prepare transaction (%s)\n"
 msgstr "无法准备事务处理 (%s)\n"
 
+#, fuzzy, c-format
+msgid ":: package %s does not have a valid architecture\n"
+msgstr "'%s' 未包含有效的压缩包扩展名。"
+
 #, c-format
 msgid ":: %s: requires %s\n"
 msgstr ":: %1$s: 要求 %2$s\n"
@@ -690,6 +731,10 @@ msgstr "%s 被指定为 HoldPkg（保留软件包）。\n"
 msgid "HoldPkg was found in target list. Do you want to continue?"
 msgstr "在目标清单中发现 HoldPkg 指定的软件包。你确定要继续吗？"
 
+#, fuzzy, c-format
+msgid " there is nothing to do\n"
+msgstr "没有软件包被修改，无事可做。"
+
 #, c-format
 msgid "Do you want to remove these packages?"
 msgstr "打算删除这些软件包吗？"
@@ -739,14 +784,6 @@ msgid "removing old packages from cache...\n"
 msgstr "正在从缓存中删除旧软件包...\n"
 
 #, c-format
-msgid "could not access cache directory\n"
-msgstr "无法访问缓存目录\n"
-
-#, c-format
-msgid "File %s does not seem to be a valid package, remove it?"
-msgstr "文件 %s 不像是个有效的软件包，删除它吗？"
-
-#, c-format
 msgid "Do you want to remove ALL files from cache?"
 msgstr "打算从缓存中删除所有文件吗？"
 
@@ -754,13 +791,13 @@ msgstr "打算从缓存中删除所有文件吗？"
 msgid "removing all files from cache...\n"
 msgstr "正在从缓存中删除所有文件...\n"
 
-#, c-format
-msgid "could not remove cache directory\n"
-msgstr "无法删除缓存目录\n"
+#, fuzzy, c-format
+msgid "could not access cache directory %s\n"
+msgstr "无法访问缓存目录\n"
 
 #, c-format
-msgid "could not create new cache directory\n"
-msgstr "无法创建新缓存目录\n"
+msgid "File %s does not seem to be a valid package, remove it?"
+msgstr "文件 %s 不像是个有效的软件包，删除它吗？"
 
 #, c-format
 msgid "failed to update %s (%s)\n"
@@ -774,6 +811,14 @@ msgstr " %s 已经是最新版本\n"
 msgid "failed to synchronize any databases\n"
 msgstr "无法同步任何数据库\n"
 
+#, fuzzy, c-format
+msgid "installed"
+msgstr "正在安装"
+
+#, c-format
+msgid " [%s: %s]"
+msgstr ""
+
 #, c-format
 msgid "repository '%s' does not exist\n"
 msgstr "软件仓库 '%s' 不存在\n"
@@ -791,46 +836,22 @@ msgid "repository \"%s\" was not found.\n"
 msgstr "软件仓库 \"%s\" 未找到\n"
 
 #, c-format
-msgid ":: Starting full system upgrade...\n"
-msgstr ":: 正在进行全面系统更新...\n"
-
-#, c-format
 msgid "skipping target: %s\n"
 msgstr "正在跳过软件包：%s\n"
 
 #, c-format
-msgid "%s package not found, searching for group...\n"
-msgstr "%s 软件包未找到，正在搜索软件包组...\n"
-
-#, c-format
-msgid ":: group %s (including ignored packages):\n"
-msgstr ":: 软件包组 %s（包含忽略的软件包）：\n"
-
-#, c-format
-msgid ":: Install whole content?"
-msgstr ":: 安装全部内容？"
-
-#, c-format
-msgid ":: Install %s from group %s?"
-msgstr ":: 从软件包组 %2$s 安装 %1$s 吗？"
+msgid ":: Starting full system upgrade...\n"
+msgstr ":: 正在进行全面系统更新...\n"
 
 #, c-format
-msgid "'%s': not found in sync db\n"
-msgstr "'%s'：没有在同步数据库中找到\n"
+msgid ":: %s and %s are in conflict\n"
+msgstr ""
 
-#, c-format
-msgid ":: %s: conflicts with %s\n"
+#, fuzzy, c-format
+msgid ":: %s and %s are in conflict (%s)\n"
 msgstr ":: %1$s: 与 %2$s 冲突\n"
 
 #, c-format
-msgid " local database is up to date\n"
-msgstr "本地数据库已是最新的\n"
-
-#, c-format
-msgid "no URL for package: %s\n"
-msgstr "无软件包的URL：%s\n"
-
-#, c-format
 msgid "Proceed with download?"
 msgstr "进行下载吗？"
 
@@ -871,18 +892,6 @@ msgstr ""
 ":: 并马上安装这些软件包吗？ "
 
 #, c-format
-msgid "loading package data...\n"
-msgstr "正在装载软件包数据...\n"
-
-#, c-format
-msgid ""
-"\n"
-"errors occurred, no packages were upgraded.\n"
-msgstr ""
-"\n"
-"发生错误，没有软件包被更新\n"
-
-#, c-format
 msgid "failed to init transaction (%s)\n"
 msgstr "无法初始化事务处理 (%s)\n"
 
@@ -987,22 +996,28 @@ msgstr "错误："
 msgid "Cleaning up..."
 msgstr "正在清理..."
 
-msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr "没有设置程序来处理 %1$s URLs。请检查 %2$s。"
+#, fuzzy
+msgid "Unable to find source file %s."
+msgstr "无法找到源代码文件 %s 进行解压缩。"
 
 msgid "Aborting..."
 msgstr "正在放弃..."
 
+msgid "There is no agent set up to handle %s URLs. Check %s."
+msgstr "没有设置程序来处理 %1$s URLs。请检查 %2$s。"
+
 msgid "The download program %s is not installed."
 msgstr "下载程序 %s 没有安装。"
 
-msgid "Pacman returned a fatal error (%i): %s"
+#, fuzzy
+msgid "'%s' returned a fatal error (%i): %s"
 msgstr "Pacman 出现致命错误 (%i)：%s"
 
 msgid "Installing missing dependencies..."
 msgstr "正在安装缺少的依赖关系..."
 
-msgid "Pacman failed to install missing dependencies."
+#, fuzzy
+msgid "'%s' failed to install missing dependencies."
 msgstr "Pacman 无法安装缺少的依赖关系..."
 
 msgid "Failed to install all missing dependencies."
@@ -1017,14 +1032,8 @@ msgstr "无法删除已安装的依赖关系。"
 msgid "Retrieving Sources..."
 msgstr "获取源代码..."
 
-msgid "You do not have write permission to store downloads in %s."
-msgstr "你没有权限将下载数据写入 %s。"
-
-msgid "Found %s in build dir"
-msgstr "在创建目录中找到 %s"
-
-msgid "Using cached copy of %s"
-msgstr "使用 %s 在缓存中的复制版本"
+msgid "Found %s"
+msgstr ""
 
 msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s 没有在创建目录中找到，也不是一个 URL。"
@@ -1044,9 +1053,6 @@ msgstr "无法找到 openssl。"
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "指定了无效的完整性算法 '%s'"
 
-msgid "Unable to find source file %s to generate checksum."
-msgstr "无法找到源代码文件 %s 来生成校验值。"
-
 msgid "Validating source files with %s..."
 msgstr "正在验证源代码文件 %s..."
 
@@ -1071,27 +1077,15 @@ msgstr "完整性检查 (%s) 缺失。"
 msgid "Extracting Sources..."
 msgstr "解压缩源码..."
 
-msgid "Unable to find source file %s for extraction."
-msgstr "无法找到源代码文件 %s 进行解压缩。"
-
 msgid "Extracting %s with %s"
 msgstr "正在解压缩 %s，使用 %s"
 
 msgid "Failed to extract %s"
 msgstr "无法解压缩 %s"
 
-msgid "Starting build()..."
-msgstr "正在开始 build()..."
-
-msgid "Build Failed."
-msgstr "创建失败。"
-
 msgid "Starting %s()..."
 msgstr "正在开始 %s()..."
 
-msgid "Packaging Failed."
-msgstr "打包失败。"
-
 msgid "Tidying install..."
 msgstr "正在清理安装..."
 
@@ -1104,7 +1098,8 @@ msgstr "正在清除其他文件..."
 msgid "Compressing man and info pages..."
 msgstr "正在压缩 man 及 info 文档..."
 
-msgid "Stripping debugging symbols from binaries and libraries..."
+#, fuzzy
+msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr "正在从二进制文件和库中清除 debug 符号..."
 
 msgid "Removing libtool .la files..."
@@ -1122,6 +1117,13 @@ msgstr "请添加软件许可证行到你的 %s！"
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "GPL 软件的列子：license=('GPL')"
 
+#, fuzzy
+msgid "Invalid backup entry : %s"
+msgstr "无效的软件包文件 '%s'。"
+
+msgid "Package contains reference to %s"
+msgstr ""
+
 msgid "Missing pkg/ directory."
 msgstr "缺少 pkg/ 目录。"
 
@@ -1143,14 +1145,23 @@ msgstr "'%s' 是无效的压缩包扩展名。"
 msgid "Failed to create package file."
 msgstr "无法创建软件包文件。"
 
+#, fuzzy
+msgid "Failed to create symlink to package file."
+msgstr "创建源码包文件失败。"
+
+#, fuzzy
+msgid "Skipping integrity checks."
+msgstr "跳过依赖关系检查。"
+
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
 
 msgid "Adding %s..."
 msgstr "正在添加 %s..."
 
-msgid "Install script %s not found."
-msgstr "安装脚本 %s 未找到。"
+#, fuzzy
+msgid "Adding %s file (%s)..."
+msgstr "正在添加 %s..."
 
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
@@ -1158,6 +1169,13 @@ msgstr "正在压缩源码包..."
 msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
+#, fuzzy
+msgid "Installing package %s with %s -U..."
+msgstr "正在使用 %2$s 生成 %1$s..."
+
+msgid "Installing %s package group with %s -U..."
+msgstr ""
+
 msgid "Failed to install built package(s)."
 msgstr "安装创建的软件包失败。"
 
@@ -1182,7 +1200,12 @@ msgstr "类似 arch=('%s') 的一行."
 msgid "Provides array cannot contain comparison (< or >) operators."
 msgstr "提供不能含有 (< 或 >)比较操作符的阵列"
 
-msgid "Install scriptlet (%s) does not exist."
+#, fuzzy
+msgid "Invalid syntax for optdepend : '%s'"
+msgstr "'CleanMethod' 设置的为无效值： '%s'\n"
+
+#, fuzzy
+msgid "%s file (%s) does not exist."
 msgstr "安装小脚本 (%s) 不存在。"
 
 msgid "options array contains unknown option '%s'"
@@ -1191,6 +1214,9 @@ msgstr "选项组含有未知的选项 '%s'"
 msgid "missing package function for split package '%s'"
 msgstr "拆分软件包 '%s' 缺少软件包功能"
 
+msgid "requested package %s is not provided in %s"
+msgstr ""
+
 msgid "Determining latest darcs revision..."
 msgstr "正在确认最新的 darcs 修正..."
 
@@ -1236,9 +1262,6 @@ msgstr "  -c, --clean      编译后清理工作文件"
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache 从缓存中清理源码文件"
 
-msgid "  --config <config> Use an alternate config file (instead of '%s')"
-msgstr "  --config <config> 使用替代的配置文件（而不是 '%s'）"
-
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
@@ -1251,9 +1274,6 @@ msgstr "  -f, --force      覆盖现存的软件包"
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
 
-msgid "      --skipinteg  Do not fail when integrity checks are missing"
-msgstr "  -g, --geninteg   如缺少完整性检查值也继续"
-
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       获得帮助"
 
@@ -1269,7 +1289,8 @@ msgstr "  -m, --nocolor    禁止彩色输出信息"
 msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    仅下载和解压缩文件"
 
-msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
+#, fuzzy
+msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <buildscript> 使用另外的编译脚本（而不是 '%s' ）"
 
 msgid ""
@@ -1282,33 +1303,48 @@ msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
 msgstr "  -s, --syncdeps   使用 pacman 安装缺少的依赖关系"
 
+#, fuzzy
 msgid ""
-"      --allsource  Generate a source-only tarball including downloaded "
+"  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 msgstr "    --allsource     只生成源码包（包括有已下载的源码）"
 
-msgid "      --asroot     Allow makepkg to run as root user"
+#, fuzzy
+msgid "  --asroot         Allow makepkg to run as root user"
 msgstr "      --asroot     允许makepkg作为 root（根用户）运行"
 
+#, fuzzy
+msgid "  --config <file>  Use an alternate config file (instead of '%s')"
+msgstr "  --config <config> 使用替代的配置文件（而不是 '%s'）"
+
+#, fuzzy
 msgid ""
-"      --holdver    Prevent automatic version bumping for development "
+"  --holdver        Prevent automatic version bumping for development "
 "PKGBUILDs"
 msgstr "      --holdver    防止开发中的 PKGBUILD 自动更新版本"
 
+msgid "  --pkg <list>     Only build listed packages from a split package"
+msgstr ""
+
+#, fuzzy
+msgid "  --skipinteg      Do not fail when integrity checks are missing"
+msgstr "  -g, --geninteg   如缺少完整性检查值也继续"
+
+#, fuzzy
 msgid ""
-"      --source     Generate a source-only tarball without downloaded sources"
+"  --source         Generate a source-only tarball without downloaded sources"
 msgstr "    --source     只生成源码包（不包括已下载的源码）"
 
 msgid "These options can be passed to pacman:"
 msgstr "这些选项可以传递给 pacman："
 
+#, fuzzy
 msgid ""
-"      --noconfirm      Do not ask for confirmation when resolving "
-"dependencies"
+"  --noconfirm      Do not ask for confirmation when resolving dependencies"
 msgstr "      --noconfirm      当解决依赖关系时不询问确认"
 
-msgid ""
-"      --noprogressbar  Do not show a progress bar when downloading files"
+#, fuzzy
+msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "      --noprogressbar  下载时不显示进度条"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
@@ -1327,6 +1363,13 @@ msgstr ""
 msgid "%s not found."
 msgstr "%s 未找到。"
 
+#, fuzzy
+msgid "You do not have write permission to store packages in %s."
+msgstr "你没有权限将下载数据写入 %s。"
+
+msgid "You do not have write permission to store downloads in %s."
+msgstr "你没有权限将下载数据写入 %s。"
+
 msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr "\\0--holdver 和 --forcever 不能同时指定。"
 
@@ -1384,14 +1427,8 @@ msgstr "正在 %s内的 BUILDENV 中加入 'fakeroot' 。"
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "不要使用 '-F' 选项。该选项仅供 makepkg 使用。"
 
-msgid "Cannot find the sudo binary! Is sudo installed?"
-msgstr "无法找到 sudo 命令！sudo 是否已安装？"
-
-msgid "Missing dependencies cannot be installed or removed as a normal user"
-msgstr "无 sudo 的情况下，无法以普通用户身份来安装或删除缺少的依赖关系；"
-
-msgid "without sudo; install and configure sudo to auto-resolve dependencies."
-msgstr "请安装和配置 sudo 以自动解决依赖关系。"
+msgid "Sudo can not be found. Will use su to acquire root privileges."
+msgstr ""
 
 msgid "%s does not exist."
 msgstr "%s 不存在。"
@@ -1415,12 +1452,22 @@ msgstr "已有一个编译好的软件包组。（使用 -f 覆盖）"
 msgid "Part of the package group has already been built. (use -f to overwrite)"
 msgstr "一部分软件包组已经编译完毕。（使用 -f 覆盖）"
 
+msgid "Repackaging without the use of a package() function is deprecated."
+msgstr ""
+
+msgid "File permissions may not be preserved."
+msgstr ""
+
 msgid "Leaving fakeroot environment."
 msgstr "正在退出 fakeroot 环境。"
 
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
+#, fuzzy
+msgid "A source package has already been built. (use -f to overwrite)"
+msgstr "已有一个编译好的软件包。（使用 -f 覆盖）"
+
 msgid "Source package created: %s"
 msgstr "源代码包已创建：%s"
 
@@ -1436,7 +1483,8 @@ msgstr "正在检查编译时依赖关系..."
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
-msgid "pacman was not found in PATH; skipping dependency checks."
+#, fuzzy
+msgid "%s was not found in PATH; skipping dependency checks."
 msgstr "没有在 PATH 中找到 pacman；跳过依赖关系检查。"
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
@@ -1484,9 +1532,9 @@ msgid ""
 "them faster, since the hard drive head\\ndoes 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。"
@@ -1571,9 +1619,9 @@ msgid ""
 "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 Aaron Griffin <aaron@archlinux.org>.\\nCopyright·(c)"
+"·2007-2008·Dan·McGee·<dan@archlinux.org>.\\n\\n这是一个自由软件；版权条款见源"
+"码。\\n在法律许可下，不承担任何担保责任。\\n"
 
 msgid "Creating 'deltas' db entry..."
 msgstr "正在生成 '增量包' 数据库记录..."
@@ -1647,12 +1695,6 @@ msgstr "指定了无效的命令名 '%s'"
 msgid "Cannot create temp directory for database building."
 msgstr "无法为建立数据库而创建临时目录。"
 
-msgid "the -f and --force options are no longer recognized"
-msgstr "-f 和 --force 选项不再被识别"
-
-msgid "use options=(force) in the PKGBUILD instead"
-msgstr "应当在 PKGBUILD 使用 options=(force) 取而代之"
-
 msgid "Creating updated database file '%s'"
 msgstr "正在生成更新的数据库文件 '%s'"
 
@@ -1665,14 +1707,108 @@ msgstr "没有包含软件包，正在创建空数据库。"
 msgid "No packages modified, nothing to do."
 msgstr "没有软件包被修改，无事可做。"
 
+#~ msgid ""
+#~ "  -p, --print-uris     print out URIs for given packages and their "
+#~ "dependencies\n"
+#~ msgstr "  -p, --print-uris     打印指定软件包及依赖关系中的URI\n"
+
+#~ msgid "%s not found, searching for group...\n"
+#~ msgstr "%s 未找到，正在搜索软件包组...\n"
+
+#~ msgid "'%s': not found in local db\n"
+#~ msgstr "'%s'：没有在本地数据库中找到\n"
+
+#~ msgid ":: group %s:\n"
+#~ msgstr ":: 组 %s:\n"
+
+#~ msgid "    Remove whole content?"
+#~ msgstr "    删除全部内容？"
+
+#~ msgid ":: Remove %s from group %s?"
+#~ msgstr ":: 从组 %2$s 中删除 %1$s 吗？"
+
+#~ msgid "could not remove cache directory\n"
+#~ msgstr "无法删除缓存目录\n"
+
+#~ msgid "could not create new cache directory\n"
+#~ msgstr "无法创建新缓存目录\n"
+
+#~ msgid "%s package not found, searching for group...\n"
+#~ msgstr "%s 软件包未找到，正在搜索软件包组...\n"
+
+#~ msgid ":: group %s (including ignored packages):\n"
+#~ msgstr ":: 软件包组 %s（包含忽略的软件包）：\n"
+
+#~ msgid ":: Install whole content?"
+#~ msgstr ":: 安装全部内容？"
+
+#~ msgid ":: Install %s from group %s?"
+#~ msgstr ":: 从软件包组 %2$s 安装 %1$s 吗？"
+
+#~ msgid "'%s': not found in sync db\n"
+#~ msgstr "'%s'：没有在同步数据库中找到\n"
+
+#~ msgid " local database is up to date\n"
+#~ msgstr "本地数据库已是最新的\n"
+
+#~ msgid "no URL for package: %s\n"
+#~ msgstr "无软件包的URL：%s\n"
+
+#~ msgid "loading package data...\n"
+#~ msgstr "正在装载软件包数据...\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "errors occurred, no packages were upgraded.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "发生错误，没有软件包被更新\n"
+
+#~ msgid "Found %s in build dir"
+#~ msgstr "在创建目录中找到 %s"
+
+#~ msgid "Using cached copy of %s"
+#~ msgstr "使用 %s 在缓存中的复制版本"
+
+#~ msgid "Unable to find source file %s to generate checksum."
+#~ msgstr "无法找到源代码文件 %s 来生成校验值。"
+
+#~ msgid "Starting build()..."
+#~ msgstr "正在开始 build()..."
+
+#~ msgid "Build Failed."
+#~ msgstr "创建失败。"
+
+#~ msgid "Packaging Failed."
+#~ msgstr "打包失败。"
+
+#~ msgid "Install script %s not found."
+#~ msgstr "安装脚本 %s 未找到。"
+
+#~ msgid "Cannot find the sudo binary! Is sudo installed?"
+#~ msgstr "无法找到 sudo 命令！sudo 是否已安装？"
+
+#~ msgid "Missing dependencies cannot be installed or removed as a normal user"
+#~ msgstr "无 sudo 的情况下，无法以普通用户身份来安装或删除缺少的依赖关系；"
+
+#~ msgid ""
+#~ "without sudo; install and configure sudo to auto-resolve dependencies."
+#~ msgstr "请安装和配置 sudo 以自动解决依赖关系。"
+
+#~ msgid "the -f and --force options are no longer recognized"
+#~ msgstr "-f 和 --force 选项不再被识别"
+
+#~ msgid "use options=(force) in the PKGBUILD instead"
+#~ msgstr "应当在 PKGBUILD 使用 options=(force) 取而代之"
+
 #~ msgid "All packages have been removed from the database. Deleting '%s'."
 #~ msgstr "所有软件包已经从数据库中删除。正在删除 '%s'。"
 
 #~ msgid ""
 #~ ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
 #~ msgstr ""
-#~ ":: %s 需要安装位于 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中的 %"
-#~ "s。一律安装吗?[Y/n]"
+#~ ":: %s 需要安装位于 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中的 "
+#~ "%s。一律安装吗?[Y/n]"
 
 #~ msgid "Checking for package upgrades... \n"
 #~ msgstr "正在检查软件包更新...\n"