Update Chinese Simplified translation

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

2 files changed, 536 insertions, 669 deletions

diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index 543fb13e..3b3af526 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-02-25 20:25+0100\n"
-"Last-Translator: 甘露(Lu.Gan) <rhythm.gan@gmail.com>\n"
+"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"PO-Revision-Date: 2008-07-17 23:01+0200\n"
+"Last-Translator: 甘露(Lu Gan) <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"
@@ -22,8 +22,8 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "正在替换老版本 %s-%s 通过在目标清单中的%s\n"
 
 #, c-format
-msgid "newer version %s-%s is in the target list -- skipping\n"
-msgstr "较新版本 %s-%s 在目标清单中 -- 跳过\n"
+msgid "skipping %s-%s because newer version %s is in the target list\n"
+msgstr "跳过 %s-%s，因为较新版本的 %s 在目标清单中\n"
 
 #, c-format
 msgid "conflicting packages were found in the target list\n"
@@ -34,8 +34,8 @@ msgid "you cannot install two conflicting packages at the same time\n"
 msgstr "你不能同时安装有冲突的两个软件包\n"
 
 #, c-format
-msgid "replacing packages with -A and -U is not supported yet\n"
-msgstr "正在使用 -A 替代软件包， -U 目前尚不支持\n"
+msgid "replacing packages with -U is not supported yet\n"
+msgstr "正在覆盖软件包， -U 目前尚不支持\n"
 
 #, c-format
 msgid "you can replace packages manually using -Rd and -U\n"
@@ -46,7 +46,7 @@ msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
 msgstr ""
-"目录权限不一致%s\n"
+"目录权限不一致 %s\n"
 "文件系统：%o  软件包：%o\n"
 
 #, c-format
@@ -62,20 +62,16 @@ msgid "could not extract %s (%s)\n"
 msgstr "无法解压缩 %s (%s)\n"
 
 #, c-format
-msgid "could not rename %s (%s)\n"
-msgstr "无法重命名 %s (%s)\n"
-
-#, c-format
-msgid "could not copy tempfile to %s (%s)\n"
-msgstr "无法复制临时文件到 %s (%s)\n"
+msgid "could not rename %s to %s (%s)\n"
+msgstr "无法重命名 %s 为 %s (%s)\n"
 
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s 已另存为 %s\n"
 
 #, c-format
-msgid "could not install %s as %s: %s\n"
-msgstr "无法安装 %s 作为 %s: %s\n"
+msgid "could not install %s as %s (%s)\n"
+msgstr "无法安装 %s 作为 %s (%s)\n"
 
 #, c-format
 msgid "%s installed as %s\n"
@@ -91,11 +87,11 @@ msgstr "无法得到当前的工作目录\n"
 
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr "更新 %s时出现错误\n"
+msgstr "更新 %s 时出现错误\n"
 
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr "安装 %s时出现错误\n"
+msgstr "安装 %s 时出现错误\n"
 
 #, c-format
 msgid "could not update database entry %s-%s\n"
@@ -106,16 +102,48 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "无法在缓存中添加记录 '%s' \n"
 
 #, c-format
+msgid "could not remove database entry %s%s\n"
+msgstr "无法删除数据库记录 %s%s\n"
+
+#, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr "数据库记录'%s'名字无效\n"
+msgstr "数据库记录 '%s' 名字无效\n"
+
+#, c-format
+msgid "corrupted database entry '%s'\n"
+msgstr "损坏的数据库记录 '%s'\n"
 
 #, c-format
 msgid "could not open file %s: %s\n"
 msgstr "无法打开文件 %s: %s\n"
 
 #, c-format
-msgid "could not remove database entry %s%s\n"
-msgstr "无法删除数据库记录 %s%s\n"
+msgid "%s database is inconsistent: name mismatch on package %s\n"
+msgstr "%s 数据库不一致：名字和软件包中的 %s 不一致\n"
+
+#, c-format
+msgid "%s database is inconsistent: version mismatch on package %s\n"
+msgstr "%s 数据库不一致：版本和软件包中的 %s 不一致\n"
+
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "无法分析 %s 中的软件包描述文件\n"
+
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "%s 中缺少软件包名字\n"
+
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "%s 中缺少软件包版本号\n"
+
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "读取软件包%s: %s发生错误\n"
+
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "%s 中缺少软件包元数据\n"
 
 #, c-format
 msgid "attempt to re-register the 'local' DB\n"
@@ -131,15 +159,63 @@ msgstr "探测到依赖关系循环：\n"
 
 #, c-format
 msgid "%s will be removed after its %s dependency\n"
-msgstr "%s将在它%s的依赖关系之后被删除\n"
+msgstr "%s 将在它 %s 的依赖关系之后被删除\n"
 
 #, c-format
 msgid "%s will be installed before its %s dependency\n"
-msgstr "%s将在它%s的依赖关系之前被安装\n"
+msgstr "%s 将在它 %s 的依赖关系之前被安装\n"
+
+#, c-format
+msgid "provider package was selected (%s provides %s)\n"
+msgstr "已选定提供软件包 (%s 提供 %s)\n"
 
 #, c-format
 msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
-msgstr "无法解决\"%s\"，\"%s\"的依赖关系\n"
+msgstr "无法解决 \"%s\"，\"%s\" 的依赖关系\n"
+
+#, c-format
+msgid "url '%s' is invalid\n"
+msgstr "url %s' 无效\n"
+
+#, c-format
+msgid "url scheme not specified, assuming HTTP\n"
+msgstr "url 结构没有指定，假定为 HTTP\n"
+
+#, c-format
+msgid "disk"
+msgstr "硬盘"
+
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "无法从 %s : %s 获取文件 '%s' \n"
+
+#, c-format
+msgid "cannot resume download, starting over\n"
+msgstr "无法恢复下载，重新开始\n"
+
+#, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "无法写入文件 '%s'\n"
+
+#, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "下载 '%s': %s 时出错\n"
+
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "写入文件 '%s': %s 时出错\n"
+
+#, c-format
+msgid "could not chdir to %s\n"
+msgstr "无法改变目录到 %s\n"
+
+#, c-format
+msgid "running XferCommand: fork failed!\n"
+msgstr "运行 XferCommand：分支失败！\n"
+
+#, c-format
+msgid "failed to download %s\n"
+msgstr "下载%s失败\n"
 
 #, c-format
 msgid "out of memory!"
@@ -210,10 +286,6 @@ msgid "invalid url for server"
 msgstr "无效的服务器url"
 
 #, c-format
-msgid "could not set parameter"
-msgstr "无法设置参数"
-
-#, c-format
 msgid "transaction already initialized"
 msgstr "处理已初始化"
 
@@ -262,10 +334,6 @@ msgid "cannot load package data"
 msgstr "无法加载软件包数据"
 
 #, c-format
-msgid "package already installed"
-msgstr "软件包已经安装"
-
-#, c-format
 msgid "package not installed or lesser version"
 msgstr "软件包没有安装或版本较低"
 
@@ -274,24 +342,20 @@ msgid "cannot remove all files for package"
 msgstr "无法删除软件包全部文件"
 
 #, c-format
-msgid "package name is not valid"
-msgstr "软件包名字无效"
-
-#, c-format
-msgid "corrupted package"
-msgstr "已损坏的软件包"
+msgid "package filename is not valid"
+msgstr "软件包文件名无效"
 
 #, c-format
 msgid "no such repository"
 msgstr "没有该软件库"
 
 #, c-format
-msgid "corrupted delta"
-msgstr "已损怀的delta"
+msgid "invalid or corrupted delta"
+msgstr "无效的或已损坏的 delta 包"
 
 #, c-format
 msgid "delta patch failed"
-msgstr "delta补丁失败"
+msgstr "delta 补丁失败"
 
 #, c-format
 msgid "group not found"
@@ -318,10 +382,6 @@ msgid "internal error"
 msgstr "内部错误"
 
 #, c-format
-msgid "libarchive error"
-msgstr "libarchive错误"
-
-#, c-format
 msgid "not confirmed"
 msgstr "不能确认"
 
@@ -330,116 +390,44 @@ msgid "invalid regular expression"
 msgstr "无效的常规表达式"
 
 #, c-format
-msgid "connection to remote host failed"
-msgstr "连接远端主机失败"
+msgid "libarchive error"
+msgstr "libarchive 错误"
 
 #, c-format
-msgid "unexpected error"
-msgstr "未预期的错误"
+msgid "download library error"
+msgstr "下载函数库出错"
 
 #, c-format
-msgid "could not get md5sum for package %s-%s\n"
-msgstr "无法得到软件包%s-%s的md5值\n"
+msgid "error invoking external downloader"
+msgstr "激活外部下载程序时出现错误"
 
 #, c-format
-msgid "md5sums do not match for package %s-%s\n"
-msgstr "软件包%s-%s的md5值不一致\n"
+msgid "unexpected error"
+msgstr "未预期的错误"
 
 #, c-format
 msgid "%s: forcing upgrade to version %s\n"
-msgstr "%s：强制更新至版本%s\n"
+msgstr "%s：强制更新至版本 %s\n"
 
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s：本地（%s）比%s版本更新(%s)\n"
-
-#, c-format
-msgid "error extracting package description file to %s\n"
-msgstr "解压缩软件包描述文件到%s时发生错误\n"
-
-#, c-format
-msgid "could not parse package description file in %s\n"
-msgstr "无法分析%s中的软件包描述文件\n"
-
-#, c-format
-msgid "missing package name in %s\n"
-msgstr "%s中缺少软件包名字\n"
-
-#, c-format
-msgid "missing package version in %s\n"
-msgstr "%s中缺少软件包版本号\n"
-
-#, c-format
-msgid "error while reading package %s: %s\n"
-msgstr "读取软件包%s: %s发生错误\n"
-
-#, c-format
-msgid "missing package metadata in %s\n"
-msgstr "%s中缺少软件包元数据\n"
+msgstr "%s：本地（%s）比 %s 的版本更新(%s)\n"
 
 #, c-format
 msgid "could not find %s in database -- skipping\n"
-msgstr "无法在数据库中找到%s -- 跳过\n"
+msgstr "无法在数据库中找到 %s -- 跳过\n"
 
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr "无法删除文件'%s': %s\n"
+msgstr "无法删除文件 '%s': %s\n"
 
 #, c-format
 msgid "could not remove database entry %s-%s\n"
-msgstr "无法删除数据库记录%s-%s\n"
+msgstr "无法删除数据库记录 %s-%s\n"
 
 #, c-format
 msgid "could not remove entry '%s' from cache\n"
-msgstr "无法从缓存中删除记录'%s'\n"
-
-#, c-format
-msgid "url '%s' is invalid, ignoring\n"
-msgstr "url %s' 无效，忽略\n"
-
-#, c-format
-msgid "url scheme not specified, assuming http\n"
-msgstr "url scheme没有指定，假定为http\n"
-
-#, c-format
-msgid "disk"
-msgstr "硬盘"
-
-#, c-format
-msgid "failed retrieving file '%s' from %s : %s\n"
-msgstr "获取文件'%s'从%s : %s失败\n"
-
-#, c-format
-msgid "cannot resume download, starting over\n"
-msgstr "无法恢复下载，重新开始\n"
-
-#, c-format
-msgid "cannot write to file '%s'\n"
-msgstr "无法写入文件'%s'\n"
-
-#, c-format
-msgid "error downloading '%s': %s\n"
-msgstr "下载'%s': %s时出错\n"
-
-#, c-format
-msgid "error writing to file '%s': %s\n"
-msgstr "写入文件'%s': %s时出错\n"
-
-#, c-format
-msgid "could not chdir to %s\n"
-msgstr "无法改变目录到%s\n"
-
-#, c-format
-msgid "running XferCommand: fork failed!\n"
-msgstr "运行XferCommand:分支失败！\n"
-
-#, c-format
-msgid "URL does not contain a file for download\n"
-msgstr "URL没有包含可下载的文件\n"
-
-#, c-format
-msgid "failed to download %s\n"
-msgstr "下载%s失败\n"
+msgstr "无法从缓存中删除记录 '%s'\n"
 
 #, c-format
 msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
@@ -451,37 +439,29 @@ msgstr "%s：忽略软件包更新（%s => %s）\n"
 
 #, c-format
 msgid "repository '%s' not found\n"
-msgstr "没有找到软件库'%s'\n"
+msgstr "没有找到软件库 '%s'\n"
 
 #, c-format
 msgid "%s-%s is up to date -- skipping\n"
-msgstr "%s-%s已经为最新 -- 跳过\n"
+msgstr "%s-%s 已经为最新 -- 跳过\n"
 
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr "%s-%s已经为最新 -- 重新安装\n"
+msgstr "%s-%s 已经为最新 -- 重新安装\n"
 
 #, c-format
 msgid "unresolvable package conflicts detected\n"
 msgstr "探测到无法解决的软件包冲突\n"
 
 #, c-format
-msgid "malloc failure: could not allocate %zd bytes\n"
-msgstr "内存分配错误：无法分配 %zd bytes\n"
+msgid "removing '%s' from target list because it conflicts with '%s'\n"
+msgstr "正在从目标清单中删除 '%s' ，因为它和 '%s' 有冲突\n"
 
 #, c-format
 msgid "command: %s\n"
 msgstr "命令：%s\n"
 
 #, c-format
-msgid "can't get md5 checksum for file %s\n"
-msgstr "无法得到文件%s的md5检查值\n"
-
-#, c-format
-msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "文件%s已损坏（坏的MD5检查值）\n"
-
-#, c-format
 msgid "failed to retrieve some files from %s\n"
 msgstr "某些文件无法从%s取回\n"
 
@@ -519,19 +499,23 @@ msgstr "无法交付处理\n"
 
 #, c-format
 msgid "could not remove lock file %s\n"
-msgstr "无法删除锁定文件%s\n"
+msgstr "无法删除锁定文件 %s\n"
 
 #, c-format
 msgid "No /bin/sh in parent environment, aborting scriptlet\n"
-msgstr "父环境中没有/bin/sh，正在中断脚本\n"
+msgstr "父环境中没有 /bin/sh，正在中断脚本\n"
 
 #, c-format
 msgid "could not create temp directory\n"
 msgstr "无法创建临时目录\n"
 
 #, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "无法复制临时文件到 %s (%s)\n"
+
+#, c-format
 msgid "could not change directory to %s (%s)\n"
-msgstr "无法更改目录到%s (%s)\n"
+msgstr "无法更改目录到 %s (%s)\n"
 
 #, c-format
 msgid "could not fork a new process (%s)\n"
@@ -547,11 +531,11 @@ msgstr "无法更改目录到/ (%s)\n"
 
 #, c-format
 msgid "call to popen failed (%s)"
-msgstr "调用popen失败(%s)"
+msgstr "调用 popen 失败(%s)"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"
-msgstr "调用waitpid失败(%s)\n"
+msgstr "调用 waitpid 失败(%s)\n"
 
 #, c-format
 msgid "scriptlet failed to execute correctly\n"
@@ -562,25 +546,13 @@ msgid "could not remove tmpdir %s\n"
 msgstr "无法删除临时目录%s\n"
 
 #, c-format
-msgid "failed to make path '%s' : %s\n"
-msgstr "无法创建路径'%s' : %s\n"
-
-#, c-format
 msgid "could not open %s: %s\n"
-msgstr "无法打开%s: %s\n"
+msgstr "无法打开 %s: %s\n"
 
 #, c-format
 msgid "no %s cache exists, creating...\n"
-msgstr "没有%s缓存存在，正在创建……\n"
+msgstr "没有 %s 缓存存在，正在创建...\n"
 
 #, c-format
 msgid "couldn't create package cache, using /tmp instead\n"
-msgstr "无法创建软件包缓存，正在使用/tmp代替\n"
-
-#, c-format
-msgid "md5: %s can't be opened\n"
-msgstr "md5：%s无法打开\n"
-
-#, c-format
-msgid "md5: %s can't be read\n"
-msgstr "md5：%s无法读取\n"
+msgstr "无法创建软件包缓存，正在使用 /tmp 代替\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e86ace45..a2ac25c3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-05-16 12:50+0700\n"
+"POT-Creation-Date: 2008-07-19 16:35+0200\n"
+"PO-Revision-Date: 2008-07-17 23:03+0200\n"
 "Last-Translator: 甘露(Lu Gan) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -17,66 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #, c-format
-msgid "failed to release transaction (%s)\n"
-msgstr "无法释放事务处理(%s)\n"
-
-#, c-format
-msgid "no targets specified (use -h for help)\n"
-msgstr "没有指定目标（使用 -h 获取帮助）\n"
-
-#, c-format
-msgid "error: %s\n"
-msgstr "错误: %s\n"
-
-#, c-format
-msgid ""
-"  if you're sure a package manager is not already\n"
-"  running, you can remove %s.\n"
-msgstr ""
-"  如果你确认软件包管理器没有正在运行，\n"
-"  你可以删除%s。\n"
-
-#, c-format
-msgid "loading package data...\n"
-msgstr "正在装载软件包数据...\n"
-
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "错误：'%s': %s\n"
-
-#, c-format
-msgid "error: failed to prepare transaction (%s)\n"
-msgstr "错误：无法准备(%s)\n"
-
-#, c-format
-msgid ":: %s: requires %s\n"
-msgstr ":: %s: 要求 %s\n"
-
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: 与 %s冲突\n"
-
-#, c-format
-msgid "%s exists in both '%s' and '%s'\n"
-msgstr "%s 存在于 '%s' 和 '%s'\n"
-
-#, c-format
-msgid "%s: %s exists in filesystem\n"
-msgstr "%s: 文件系统中已存在 %s \n"
-
-#, c-format
-msgid ""
-"\n"
-"errors occurred, no packages were upgraded.\n"
-msgstr ""
-"\n"
-"发生错误，没有软件包被更新\n"
-
-#, c-format
-msgid "error: failed to commit transaction (%s)\n"
-msgstr "错误：无法交付处理(%s)\n"
-
-#, c-format
 msgid "checking dependencies...\n"
 msgstr "正在检查依赖关系...\n"
 
@@ -94,15 +34,15 @@ msgstr "正在查找内部冲突...\n"
 
 #, c-format
 msgid "installing %s...\n"
-msgstr "正在安装%s...\n"
+msgstr "正在安装 %s...\n"
 
 #, c-format
 msgid "removing %s...\n"
-msgstr "正在删除%s...\n"
+msgstr "正在删除 %s...\n"
 
 #, c-format
 msgid "upgrading %s...\n"
-msgstr "正在升级%s...\n"
+msgstr "正在升级 %s...\n"
 
 #, c-format
 msgid "checking package integrity...\n"
@@ -110,15 +50,15 @@ 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... "
-msgstr "正在使用%s生成%s..."
+msgstr "正在使用 %s 生成 %s..."
 
 #, c-format
 msgid "success!\n"
@@ -130,45 +70,40 @@ msgstr "失败。\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: 正在从%s软件仓库获取软件包...\n"
+msgstr ":: 正在从 %s 软件仓库获取软件包...\n"
 
 #, c-format
 msgid ""
-":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
-"n] "
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
 msgstr ""
-":: %s需要安装列在IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中的%s。确"
-"定都进行安装吗?[Y/n]"
+":: %s 需要安装列在 IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中的 %s。"
+"无论如何都安装吗?[Y/n]"
 
 #, c-format
-msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
+msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
 msgstr ""
-":: %s列在IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中。真的确定要安装"
-"吗?[Y/n]"
-
-#, c-format
-msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s是作为HoldPkg（保留软件包）指定的。真的确定要删除吗？[Y/n]"
+":: %s 列在IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中。真的确定要安装"
+"吗?"
 
 #, c-format
-msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: 用%s/%s替代%s？[Y/n]"
+msgid ":: %s is designated as a HoldPkg. Remove anyway?"
+msgstr ":: %s 是作为 HoldPkg（保留软件包）指定的。真的确定要删除吗？"
 
 #, c-format
-msgid "Replacing %s with %s/%s\n"
-msgstr "正在用 %s/%s替代%s\n"
+msgid ":: Replace %s with %s/%s?"
+msgstr ":: 用 %s/%s 替代 %s？"
 
 #, c-format
-msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: %s与%s有冲突。删除%s？[Y/n]"
+msgid ":: %s conflicts with %s. Remove %s?"
+msgstr ":: %s 与 %s 有冲突。删除 %s？"
 
 #, c-format
-msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s：本地版本较新。真的确定要更新吗？[Y/n]"
+msgid ":: %s-%s: local version is newer. Upgrade anyway?"
+msgstr ":: %s-%s：本地版本较新。真的确定要更新吗？"
 
 #, c-format
-msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: 文件%s已经损坏。你想要删除它吗？[Y/n]"
+msgid ":: File %s is corrupted. Do you want to delete it?"
+msgstr ":: 文件 %s 已经损坏。你想要删除它吗？"
 
 #, c-format
 msgid "installing"
@@ -187,22 +122,22 @@ msgid "checking for file conflicts"
 msgstr "正在检查文件冲突"
 
 #, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "内存分配失败：无法分配 %zd bytes\n"
+
+#, c-format
 msgid "Explicitly installed"
 msgstr "单独指定安装"
 
 #, c-format
 msgid "Installed as a dependency for another package"
-msgstr "已经作为其他软件包的依赖关系安装"
+msgstr "已作为其他软件包的依赖关系安装"
 
 #, c-format
 msgid "Unknown"
 msgstr "未知的"
 
 #, c-format
-msgid "Filename       :"
-msgstr "文件名　　："
-
-#, c-format
 msgid "Name           :"
 msgstr "名称　　　："
 
@@ -307,8 +242,8 @@ msgid "Backup Files:\n"
 msgstr "备份文件：\n"
 
 #, c-format
-msgid "error: could not calculate checksums for %s\n"
-msgstr "错误：无法计算%s的完整性校验值\n"
+msgid "could not calculate checksums for %s\n"
+msgstr "无法计算 %s 的完整性校验值\n"
 
 #, c-format
 msgid "MODIFIED\t%s\n"
@@ -327,8 +262,8 @@ msgid "(none)\n"
 msgstr "（无）\n"
 
 #, c-format
-msgid "error: no changelog available for '%s'.\n"
-msgstr "错误: '%s'没有可获得的更新日志。\n"
+msgid "no changelog available for '%s'.\n"
+msgstr "'%s' 没有可获得的更新日志。\n"
 
 #, c-format
 msgid "options"
@@ -359,23 +294,15 @@ msgstr ""
 "使用 '%s --help' 以及其他选项查看更多语法\n"
 
 #, c-format
-msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr "      --asdeps         作为非单独指定安装的软件包安装\n"
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgstr "  -c, --cascade        删除软件包及所有的依赖于此的软件包\n"
 
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
 msgstr "  -d, --nodeps         略过依赖关系检查\n"
 
 #, c-format
-msgid "  -f, --force          force install, overwrite conflicting files\n"
-msgstr "  -f,  -force          强制安装，覆盖存在冲突的文件\n"
-
-#, c-format
-msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        删除软件包及所有的依赖于此的软件包\n"
-
-#, c-format
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr "  -k, --dbonly         只删除数据库记录，不删除文件\n"
@@ -387,7 +314,28 @@ msgstr "  -n, --nosave         同时删除配置文件\n"
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
-msgstr "  -s, --recursive      同时删除（不会破坏其他软件包的）依赖关系\n"
+"                       (-ss includes explicitly installed dependencies too)\n"
+msgstr ""
+"  -s, --recursive      同时删除（不会破坏其他软件包的）依赖关系\n"
+"                       (-ss·也包括单独指定安装的依赖关系)\n"
+
+#, c-format
+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"
+msgstr "      --asdeps         作为非单独指定安装的软件包安装\n"
+
+#, c-format
+msgid "      --asexplicit     install packages as explicitly installed\n"
+msgstr "      --asexplicit     作为单独指定安装的软件包安装\n"
+
+#, c-format
+msgid "  -f, --force          force install, overwrite conflicting files\n"
+msgstr "  -f,  -force          强制安装，覆盖存在冲突的文件\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -452,10 +400,6 @@ msgid ""
 msgstr "  -c, --clean          从缓存目录中删除旧软件包（-cc 清除所有）\n"
 
 #, c-format
-msgid "  -e, --dependsonly    install dependencies only\n"
-msgstr "  -e, --dependsonly    仅安装依赖关系\n"
-
-#, c-format
 msgid "  -i, --info           view package information\n"
 msgstr "  -i, --info           查看软件包信息\n"
 
@@ -553,12 +497,24 @@ msgstr "      --cachedir <目录> 指定另外的软件包缓存位置\n"
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
-"                       the terms of the GNU General Public License\n"
+"                       the terms of the GNU General Public License.\n"
 msgstr ""
-"                       本程序可以按照GNU条款\n"
+"                       本程序可以在GNU一般公众许可条款下\n"
 "                       自由分发\n"
 
 #, c-format
+msgid "segmentation fault\n"
+msgstr "段错误\n"
+
+#, c-format
+msgid ""
+"Internal pacman error: Segmentation fault.\n"
+"Please submit a full bug report with --debug if appropriate.\n"
+msgstr ""
+"内部 pacman 错误：段错误\n"
+"如果适当，请提交一个使用了 --debug 参数的完全的臭虫报告。\n"
+
+#, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
 msgstr "设置根目录'%s' (%s)时出现问题 \n"
 
@@ -603,6 +559,10 @@ msgid "config file %s, line %d: directive '%s' not recognized.\n"
 msgstr "配置文件%s，第%d行：未知命令'%s'\n"
 
 #, c-format
+msgid "invalid value for 'CleanMethod' : '%s'\n"
+msgstr "无效值为·'CleanMethod'·：%s'\n"
+
+#, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "初始化alpm库失败(%s)\n"
 
@@ -619,32 +579,32 @@ msgid "no operation specified (use -h for help)\n"
 msgstr "没有指定的操作（使用-h获取帮助）\n"
 
 #, c-format
-msgid "error: no file was specified for --owns\n"
-msgstr "错误：没有为--owns指定文件\n"
+msgid "no file was specified for --owns\n"
+msgstr "错误：没有为 --owns 指定文件\n"
 
 #, c-format
-msgid "error: failed to read file '%s': %s\n"
-msgstr "错误：无法读取文件'%s': %s\n"
+msgid "failed to read file '%s': %s\n"
+msgstr "无法读取文件 '%s': %s\n"
 
 #, c-format
-msgid "error: cannot determine ownership of a directory\n"
-msgstr "错误：无法确定目录的所有者属性\n"
+msgid "cannot determine ownership of a directory\n"
+msgstr "无法确定目录的所有者属性\n"
 
 #, c-format
-msgid "error: cannot determine real path for '%s': %s\n"
-msgstr "错误：无法确定'%s': %s的真实路径。\n"
+msgid "cannot determine real path for '%s': %s\n"
+msgstr "无法确定 '%s': %s 的真实路径。\n"
 
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s属于%s %s\n"
 
 #, c-format
-msgid "error: No package owns %s\n"
-msgstr "错误：没有软件包拥有%s\n"
+msgid "No package owns %s\n"
+msgstr "没有软件包拥有 %s\n"
 
 #, c-format
-msgid "error: group \"%s\" was not found\n"
-msgstr "错误：没有找到\"%s\"组\n"
+msgid "group \"%s\" was not found\n"
+msgstr "没有找到 \"%s\" 组\n"
 
 #, c-format
 msgid "Checking for package upgrades... \n"
@@ -659,24 +619,40 @@ msgid "no usable package repositories configured.\n"
 msgstr "没有设置可用的软件包库。\n"
 
 #, c-format
-msgid "error: package \"%s\" not found\n"
-msgstr "错误：软件包\"%s\"没有找到\n"
+msgid "no targets specified (use -h for help)\n"
+msgstr "没有指定目标（使用 -h 获取帮助）\n"
+
+#, c-format
+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? [Y/n] "
-msgstr "    删除全部内容？[Y/n]"
+msgid "    Remove whole content?"
+msgstr "····删除全部内容？"
 
 #, c-format
-msgid ":: Remove %s from group %s? [Y/n] "
-msgstr ":: 从组%s中删除%s吗？[Y/n]"
+msgid ":: Remove %s from group %s?"
+msgstr ":: 从组 %s 中删除 %s 吗？"
 
 #, c-format
-msgid "error: failed to init transaction (%s)\n"
-msgstr "错误：无法初始化事务处理(%s)\n"
+msgid "failed to prepare transaction (%s)\n"
+msgstr "无法准备事务处理(%s)\n"
+
+#, c-format
+msgid ":: %s: requires %s\n"
+msgstr ":: %s: 要求 %s\n"
 
 #, c-format
 msgid "Targets:"
@@ -685,30 +661,34 @@ msgstr "目标："
 #, c-format
 msgid ""
 "\n"
-"Do you want to remove these packages? [Y/n] "
+"Do you want to remove these packages?"
 msgstr ""
 "\n"
-"打算删除这些软件包吗？ [Y/n] "
+"打算删除这些软件包吗？"
+
+#, c-format
+msgid "failed to commit transaction (%s)\n"
+msgstr "无法交付处理(%s)\n"
 
 #, c-format
-msgid "error: could not access database directory\n"
-msgstr "错误：无法进入数据库目录\n"
+msgid "could not access database directory\n"
+msgstr "无法进入数据库目录\n"
 
 #, c-format
-msgid "Do you want to remove %s? [Y/n] "
-msgstr "打算删除%s？[Y/n]"
+msgid "Do you want to remove %s?"
+msgstr "打算删除 %s？"
 
 #, c-format
-msgid "error: could not remove repository directory\n"
-msgstr "错误：无法删除软件仓库目录\n"
+msgid "could not remove repository directory\n"
+msgstr "无法删除软件仓库目录\n"
 
 #, c-format
 msgid "Database directory: %s\n"
 msgstr "数据库目录：%s\n"
 
 #, c-format
-msgid "Do you want to remove unused repositories? [Y/n] "
-msgstr "打算删除无用的软件仓库？[Y/n]"
+msgid "Do you want to remove unused repositories?"
+msgstr "打算删除无用的软件仓库？"
 
 #, c-format
 msgid "Database directory cleaned up\n"
@@ -719,144 +699,168 @@ msgid "Cache directory: %s\n"
 msgstr "缓存目录：%s\n"
 
 #, c-format
-msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
-msgstr "打算从缓存中删除没有安装的软件包吗？[Y/n]"
+msgid "Do you want to remove uninstalled packages from cache?"
+msgstr "打算从缓存中删除没有安装的软件包吗？"
+
+#, c-format
+msgid "Do you want to remove outdated packages from cache?"
+msgstr "打算从缓存中删除没有安装的软件包吗？"
 
 #, c-format
 msgid "removing old packages from cache... "
 msgstr "正在从缓存中删除旧软件包..."
 
 #, c-format
-msgid "error: could not access cache directory\n"
-msgstr "错误：无法进入缓存目录\n"
+msgid "could not access cache directory\n"
+msgstr "无法进入缓存目录\n"
 
 #, c-format
 msgid "done.\n"
 msgstr "完毕。\n"
 
 #, c-format
-msgid "Do you want to remove ALL packages from cache? [Y/n] "
-msgstr "打算从缓存中删除所有软件包吗？[Y/n]"
+msgid "Do you want to remove ALL packages from cache?"
+msgstr "打算从缓存中删除所有软件包吗？"
 
 #, c-format
 msgid "removing all packages from cache... "
 msgstr "正在从缓存中删除所有软件包..."
 
 #, c-format
-msgid "error: could not remove cache directory\n"
-msgstr "错误：无法删除缓存目录\n"
+msgid "could not remove cache directory\n"
+msgstr "无法删除缓存目录\n"
 
 #, c-format
-msgid "error: could not create new cache directory\n"
-msgstr "错误：无法创建新缓存目录\n"
+msgid "could not create new cache directory\n"
+msgstr "无法创建新缓存目录\n"
 
 #, c-format
-msgid "error: failed to release transaction (%s)\n"
-msgstr "错误：无法释放处理(%s)\n"
+msgid "failed to update %s (%s)\n"
+msgstr "无法升级 %s (%s)\n"
 
 #, c-format
-msgid "error: failed to synchronize %s: %s\n"
-msgstr "错误：无法同步%s: %s\n"
+msgid " %s is up to date\n"
+msgstr " %s 已经是最新版本\n"
 
 #, c-format
-msgid "error: failed to update %s (%s)\n"
-msgstr "错误：无法升级%s (%s)\n"
+msgid "failed to synchronize any databases\n"
+msgstr "无法同步任何数据库\n"
 
 #, c-format
-msgid " %s is up to date\n"
-msgstr " %s 已经是最新版本\n"
+msgid "repository '%s' does not exist\n"
+msgstr "软件仓库 '%s' 不存在\n"
 
 #, c-format
-msgid "error: repository '%s' does not exist\n"
-msgstr "错误：软件仓库'%s'不存在\n"
+msgid "package '%s' was not found in repository '%s'\n"
+msgstr "软件包'%s'没有在'%s'软件仓库里找到\n"
 
 #, c-format
-msgid "error: package '%s' was not found in repository '%s'\n"
-msgstr "错误：软件包'%s'没有在'%s'软件仓库里找到\n"
+msgid "package '%s' was not found\n"
+msgstr "软件包 '%s' 没有找到\n"
 
 #, c-format
-msgid "error: package '%s' was not found\n"
-msgstr "错误：软件包'%s'没有找到\n"
+msgid "repository \"%s\" was not found.\n"
+msgstr "软件仓库 \"%s\" 没有找到\n"
 
 #, c-format
-msgid "error: repository \"%s\" was not found.\n"
-msgstr "错误：软件仓库\"%s\"没有找到\n"
+msgid ":: Starting full system upgrade...\n"
+msgstr ":: 正在进行全系统更新...\n"
 
 #, c-format
-msgid ":: Synchronizing package databases...\n"
-msgstr ":: 正在同步软件包数据库...\n"
+msgid "%s package not found, searching for group...\n"
+msgstr "%s 软件包没有找到，正在搜索软件包组...\n"
 
 #, c-format
-msgid "error: failed to synchronize any databases\n"
-msgstr "错误：无法同步任何数据库\n"
+msgid ":: group %s (including ignored packages):\n"
+msgstr ":: 软件包组 %s（包含忽略的软件包）：\n"
 
 #, c-format
-msgid ":: Starting full system upgrade...\n"
-msgstr ":: 正在进行全系统更新...\n"
+msgid ":: Install whole content?"
+msgstr ":: 安装全部内容？"
 
 #, c-format
-msgid ":: pacman has detected a newer version of itself.\n"
-msgstr ":: pacman检测到自身的一个新版本\n"
+msgid ":: Install %s from group %s?"
+msgstr ":: 从软件包组 %s 安装 %s 吗？"
 
 #, c-format
-msgid ""
-":: Do you want to cancel the current operation\n"
-":: and install the new pacman version now? [Y/n] "
-msgstr ""
-":: 打算取消当前操作\n"
-":: 并马上安装新版本的pacman吗？ [Y/n] "
+msgid "'%s': not found in sync db\n"
+msgstr "'%s'：没有在同步数据库中找到\n"
 
 #, c-format
-msgid "error: pacman: %s\n"
-msgstr "错误：pacman：%s\n"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: 与 %s 冲突\n"
 
 #, c-format
-msgid ":: group %s (including ignored packages):\n"
-msgstr ":: 软件包组%s（包含忽略的软件包）：\n"
+msgid " local database is up to date\n"
+msgstr "本地数据库已是最新的\n"
 
 #, c-format
-msgid ":: Install whole content? [Y/n] "
-msgstr ":: 安装全部内容？[Y/n]"
+msgid "Proceed with download?"
+msgstr "进行下载吗？"
 
 #, c-format
-msgid ":: Install %s from group %s? [Y/n] "
-msgstr ":: 从软件包组%s安装%s吗？[Y/n]"
+msgid "Proceed with installation?"
+msgstr "进行安装吗？"
 
 #, c-format
-msgid "Warning: %s provides %s\n"
-msgstr "警告：%s已提供%s\n"
+msgid "%s exists in both '%s' and '%s'\n"
+msgstr "%s 存在于 '%s' 和 '%s'\n"
 
 #, c-format
-msgid "error: several packages provide %s, please specify one :\n"
-msgstr "错误：几个软件包都提供%s，请指定一个：\n"
+msgid "%s: %s exists in filesystem\n"
+msgstr "%s: 文件系统中已存在 %s \n"
 
 #, c-format
-msgid "error: '%s': not found in sync db\n"
-msgstr "错误：'%s'：没有在同步数据库中找到\n"
+msgid "%s is invalid or corrupted\n"
+msgstr "%s·无效或已损坏\n"
 
 #, c-format
-msgid " local database is up to date\n"
-msgstr "本地数据库已是最新的\n"
+msgid "Errors occurred, no packages were upgraded.\n"
+msgstr "发生错误，没有软件包被更新。\n"
+
+#, c-format
+msgid ":: Synchronizing package databases...\n"
+msgstr ":: 正在同步软件包数据库...\n"
+
+#, c-format
+msgid ":: The following packages should be upgraded first :\n"
+msgstr ":: 下列软件包应当首先更新：\n"
+
+#, c-format
+msgid ""
+":: Do you want to cancel the current operation\n"
+":: and upgrade these packages now?"
+msgstr ""
+":: 打算取消当前操作\n"
+":: 并马上安装这些软件包吗？ "
 
 #, c-format
-msgid "Beginning download...\n"
-msgstr "开始下载...\n"
+msgid "loading package data...\n"
+msgstr "正在装载软件包数据...\n"
 
 #, c-format
-msgid "Proceed with download? [Y/n] "
-msgstr "进行下载吗？[Y/n]"
+msgid ""
+"\n"
+"errors occurred, no packages were upgraded.\n"
+msgstr ""
+"\n"
+"发生错误，没有软件包被更新\n"
 
 #, c-format
-msgid "Beginning upgrade process...\n"
-msgstr "开始更新...\n"
+msgid "failed to init transaction (%s)\n"
+msgstr "无法初始化事务处理(%s)\n"
 
 #, c-format
-msgid "Proceed with installation? [Y/n] "
-msgstr "进行安装吗？[Y/n]"
+msgid ""
+"  if you're sure a package manager is not already\n"
+"  running, you can remove %s\n"
+msgstr ""
+"  如果你确认软件包管理器没有在运行，\n"
+"  你可以删除 %s。\n"
 
 #, c-format
-msgid "Errors occurred, no packages were upgraded.\n"
-msgstr "发生错误，没有软件包被更新。\n"
+msgid "failed to release transaction (%s)\n"
+msgstr "无法释放事务处理(%s)\n"
 
 #, c-format
 msgid "None\n"
@@ -879,6 +883,14 @@ msgid "Total Installed Size:   %.2f MB\n"
 msgstr "全部安装大小:  %.2f MB\n"
 
 #, c-format
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#, c-format
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#, c-format
 msgid "Y"
 msgstr "Y"
 
@@ -887,6 +899,14 @@ msgid "YES"
 msgstr "是"
 
 #, c-format
+msgid "N"
+msgstr "N"
+
+#, c-format
+msgid "NO"
+msgstr "否"
+
+#, c-format
 msgid "error: %s"
 msgstr "错误：%s"
 
@@ -910,72 +930,6 @@ msgstr "警告："
 msgid "function: "
 msgstr "功能："
 
-msgid "Usage: %s <root> <destfile> [package_directory]"
-msgstr "用法：%s <root> <destfile> [软件包目录]"
-
-msgid ""
-"NOTE: this script is DEPRECATED. It will be removed in the next major"
-"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
-msgstr ""
-"注意：该脚本标注为“放弃”，将在pacman的下一个\\n主要版本中删除，请使用repo-add"
-"和repo-remove。\\n\\n"
-
-msgid ""
-"gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
-"<root>. gensync builds the database in a temporary directory\\nand then "
-"compresses it to <destfile>.\\n\\n"
-msgstr ""
-"gensync会通过读取<root>目录下所有的PKGBUILD来生成一个同步数据库。\\ngensync会"
-"在一个临时目录中创建该数据库\\n然后压缩到<destfile>.\\n\\n"
-
-msgid ""
-"gensync will calculate md5sums of packages in the same directory as"
-"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
-msgstr ""
-"gensync会为在<destfile>同目录下的所有软件包计算md5值\\n除非另外指定了其他的"
-"［软件包_目录］。\\n\\n"
-
-msgid ""
-"note: The <destfile> name is important. It must be of the form\\n      "
-"{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
-"package repository you configured in /etc/pacman.conf. The\\n      generated "
-"database must reside in the same directory as your\\n      custom packages "
-"(also configured in /etc/pacman.conf)\\n\\n"
-msgstr ""
-"注意：<destfile>的名称十分重要。它的形式必须是\\n      {treename}.db.tar.gz。"
-"这里的{treename}是你在/etc/pacman.conf中\\n      自定义软件包库的名称。生成的"
-"数据库\\n      必须跟你（在/etc/pacman.conf配置的）自定义软件包放在同一目录。"
-"\\n\\n"
-
-msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-msgstr "例子：gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-
-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"
-msgstr ""
-"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\n这是免费软件；"
-"版权条款见源码\\n在法律许可下，不承担任何担保责任。\\n"
-
-msgid "%s not found. Can not continue."
-msgstr "%s没有找到。无法继续。"
-
-msgid "invalid root dir: %s"
-msgstr "无效的根目录：%s"
-
-msgid "gensync: building database entries, generating md5sums..."
-msgstr "gensync：正在创建数据库记录，正在生成md5校验值..."
-
-msgid "failed to parse %s"
-msgstr "无法处理：%s"
-
-msgid "could not find %s-%s-%s-%s%s - skipping"
-msgstr "无法找到%s-%s-%s-%s%s - 跳过"
-
-msgid "creating repo DB..."
-msgstr "正在产生库DB..."
-
 msgid "WARNING:"
 msgstr "警告："
 
@@ -985,28 +939,17 @@ msgstr "错误："
 msgid "Cleaning up..."
 msgstr "正在清理..."
 
-msgid ""
-"Options beginning with 'no' will be deprecated in the next version of "
-"makepkg!"
-msgstr "以no开头的选项将在makepkg的下个版本中被放弃。"
-
-msgid "Please replace 'no' with '!': %s -> %s."
-msgstr "请用'!'代替'no'：%s -> %s"
-
-msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-msgstr "'keepdocs'选项也许不像计划那样工作。请用'docs'代替。"
-
 msgid "There is no agent set up to handle %s URLs. Check %s."
-msgstr "没有设置程序来处理%s URLs。检查%s。"
+msgstr "没有设置程序来处理 %s URLs。请检查 %s。"
 
 msgid "Aborting..."
 msgstr "正在放弃..."
 
 msgid "The download program %s is not installed."
-msgstr "下载的程序%s没有被安装。"
+msgstr "下载程序 %s 没有安装。"
 
 msgid "Pacman returned a fatal error (%i): %s"
-msgstr "Pacman出现致命错误(%i):：%s"
+msgstr "Pacman 出现致命错误(%i)：%s"
 
 msgid "Installing missing dependencies..."
 msgstr "正在安装缺少的依赖关系..."
@@ -1014,62 +957,53 @@ msgstr "正在安装缺少的依赖关系..."
 msgid "Pacman failed to install missing dependencies."
 msgstr "Pacman无法安装缺少的依赖关系..."
 
-msgid "Building missing dependencies..."
-msgstr "正在创建缺少的依赖关系..."
-
-msgid "Source root cannot be found - please make sure it is specified in %s."
-msgstr "源码根目录没有找到－清确认已在%s指定。"
-
-msgid "Could not find '%s' under %s"
-msgstr "无法在%s下面找到'%s' 。"
-
-msgid "Failed to build '%s'"
-msgstr "无法编译'%s'"
-
 msgid "Failed to install all missing dependencies."
 msgstr "无法安装所有缺少的依赖关系。"
 
 msgid "Missing Dependencies:"
 msgstr "缺少依赖关系："
 
+msgid "Failed to remove installed dependencies."
+msgstr "无法删除已安装的依赖关系。"
+
 msgid "Retrieving Sources..."
 msgstr "获取源代码..."
 
 msgid "You do not have write permission to store downloads in %s."
-msgstr "你没有写权力把下载存放在%s"
+msgstr "你没有写权力把下载存放在 %s。"
 
 msgid "Found %s in build dir"
-msgstr "在创建目录中找到%s"
+msgstr "在创建目录中找到 %s"
 
 msgid "Using cached copy of %s"
-msgstr "使用%s在缓存中的复制版本"
+msgstr "使用 %s 在缓存中的复制版本"
 
 msgid "%s was not found in the build directory and is not a URL."
-msgstr "%s没有在创建目录中找到，也不是一个URL。"
+msgstr "%s 没有在创建目录中找到，也不是一个URL。"
 
 msgid "Downloading %s..."
-msgstr "正在下载%s..."
+msgstr "正在下载 %s..."
 
 msgid "Failure while downloading %s"
-msgstr "无法下载%s"
+msgstr "无法下载 %s"
 
 msgid "Generating checksums for source files..."
 msgstr "正在为源代码文件创建完整性检查值..."
 
 msgid "Invalid integrity algorithm '%s' specified."
-msgstr "指定了无效的'%s'完整性编码"
+msgstr "指定了无效的 '%s' 完整性编码"
 
-msgid "Cannot find the '%s' program."
-msgstr "无法找到'%s'程序。"
+msgid "Cannot find openssl."
+msgstr "无法找到 openssl。"
 
 msgid "Unable to find source file %s to generate checksum."
-msgstr "无法找到源代码文件%s来创建完整性检查码。"
+msgstr "无法找到源代码文件 %s 来创建完整性检查码。"
 
 msgid "Invalid integrity algorithm '%s' specified"
-msgstr "指定了无效的'%s' 完整性编码"
+msgstr "指定了无效的 '%s' 完整性编码"
 
 msgid "Validating source files with %s..."
-msgstr "正在检查源码完整性%s..."
+msgstr "正在检查源码完整性 %s..."
 
 msgid "NOT FOUND"
 msgstr "没有找到"
@@ -1090,46 +1024,46 @@ msgid "Extracting Sources..."
 msgstr "解压缩源码..."
 
 msgid "Unable to find source file %s for extraction."
-msgstr "无法找到源码文件%s来解压缩。"
+msgstr "无法找到源码文件 %s 进行解压缩。"
 
 msgid "Failed to extract %s"
-msgstr "无法解压缩%s"
+msgstr "无法解压缩 %s"
 
 msgid "Starting build()..."
-msgstr "开始创建..."
+msgstr "正在开始 build()..."
 
 msgid "Build Failed."
 msgstr "创建失败。"
 
 msgid "Tidying install..."
-msgstr "正在整洁安装..."
+msgstr "正在清理安装..."
 
 msgid "Removing info/doc files..."
-msgstr "正在删除info/doc文件..."
+msgstr "正在删除 info/doc 文件..."
 
 msgid "Compressing man pages..."
-msgstr "正在压缩man帮助页..."
+msgstr "正在压缩 man 帮助页..."
 
 msgid "Stripping debugging symbols from binaries and libraries..."
-msgstr "正在从二进制执行文件和库中删除debug符号..."
+msgstr "正在从二进制执行文件和库中删除 debug 符号..."
 
 msgid "Removing libtool .la files..."
-msgstr "正在删除libtool .la文件..."
+msgstr "正在删除 libtool .la 文件..."
 
 msgid "Removing empty directories..."
 msgstr "正在删除空目录..."
 
 msgid "Missing pkg/ directory."
-msgstr "缺少pkg/目录。"
+msgstr "缺少 pkg/ 目录。"
 
 msgid "Creating package..."
 msgstr "正在创建软件包..."
 
 msgid "Generating .PKGINFO file..."
-msgstr "正在生成.PKGINFO文件..."
+msgstr "正在生成 .PKGINFO 文件..."
 
 msgid "Please add a license line to your %s!"
-msgstr "请添加软件许可行到你的%s！"
+msgstr "请添加软件许可行到你的 %s！"
 
 msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "GPL软件的列子：license=('GPL')"
@@ -1147,34 +1081,34 @@ msgid "Failed to create package file."
 msgstr "无法创建软件包文件。"
 
 msgid "Cannot find the xdelta binary! Is xdelta installed?"
-msgstr "无法找到xdelta执行文件！是否xdelta已经安装？"
+msgstr "无法找到 xdelta 执行文件！是否 xdelta 已经安装？"
 
 msgid "Making delta from version %s..."
-msgstr "正在从版本%s制作delta..."
+msgstr "正在从版本 %s 制作delta..."
 
 msgid "Recreating package tarball from delta to match md5 signatures"
-msgstr "正在从delta重新生成软件包打包文档以符合md5签名"
+msgstr "正在从 delta 重新生成软件包打包文档以符合 md5 签名"
 
 msgid "NOTE: the delta should ONLY be distributed with this tarball"
-msgstr "注意：本delta应当只与本压缩包一起分发"
+msgstr "注意：本 delta 应当只与本压缩包一起分发"
 
 msgid "Could not generate the package from the delta."
-msgstr "无法从delta中生成软件包。"
+msgstr "无法从 delta 中生成软件包。"
 
 msgid "Delta was not able to be created."
-msgstr "无法创建delta。"
+msgstr "无法创建 delta。"
 
 msgid "No previous version found, skipping xdelta."
-msgstr "没有发现先前版本，跳过xdelta。"
+msgstr "没有发现先前版本，跳过 xdelta。"
 
 msgid "Creating source package..."
 msgstr "正在创建源码包..."
 
 msgid "Adding %s..."
-msgstr "正在添加%s..."
+msgstr "正在添加 %s..."
 
 msgid "Install script %s not found."
-msgstr "安装脚本%s没有找到。"
+msgstr "安装脚本 %s 没有找到。"
 
 msgid "Compressing source package..."
 msgstr "正在压缩源码包..."
@@ -1183,22 +1117,22 @@ msgid "Failed to create source package file."
 msgstr "创建源码包文件失败。"
 
 msgid "Determining latest darcs revision..."
-msgstr "正在确认最新的darcs修正..."
+msgstr "正在确认最新的 darcs 修正..."
 
 msgid "Determining latest cvs revision..."
-msgstr "正在确认最新的cvs修正..."
+msgstr "正在确认最新的 cvs 修正..."
 
 msgid "Determining latest git revision..."
-msgstr "正在确认最新的git修正..."
+msgstr "正在确认最新的 git 修正..."
 
 msgid "Determining latest svn revision..."
-msgstr "正在确认最新的svn修正..."
+msgstr "正在确认最新的 svn 修正..."
 
 msgid "Determining latest bzr revision..."
-msgstr "正在确认最新的bzr修正..."
+msgstr "正在确认最新的 bzr 修正..."
 
 msgid "Determining latest hg revision..."
-msgstr "正在确认最新的hg修正..."
+msgstr "正在确认最新的 hg 修正..."
 
 msgid "Version found: %s"
 msgstr "找到版本：%s"
@@ -1210,10 +1144,7 @@ msgid "Options:"
 msgstr "选项："
 
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
-msgstr "  -A, --ignorearch 忽略%s中的不完整的架构段"
-
-msgid "  -b, --builddeps  Build missing dependencies from source"
-msgstr "  -b, --builddeps  从源码编译缺少的依赖关系"
+msgstr "  -A, --ignorearch 忽略 %s 中的不完整的架构段"
 
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      编译后清理工作文件"
@@ -1225,7 +1156,7 @@ msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr " -d, --nodeps     跳过所有依赖关系检查"
 
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
-msgstr "  -e, --noextract  不解压缩源码文件（使用现存的src/目录）"
+msgstr "  -e, --noextract  不解压缩源码文件（使用现存的 src/ 目录）"
 
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      覆盖现存的软件包"
@@ -1249,31 +1180,31 @@ msgid "  -o, --nobuild    Download and extract files only"
 msgstr "  -o, --nobuild    仅下载和解压缩文件"
 
 msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
-msgstr "  -p <编译脚本> 使用另外的编译脚本（而不是'%s'）"
+msgstr "  -p <buildscript> 使用另外的编译脚本（而不是 '%s' ）"
 
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
 msgid "  -R, --repackage  Repackage contents of pkg/ without building"
-msgstr "  -R, --repackage  不编译而重新打包pkg/内容"
+msgstr "  -R, --repackage  不编译而重新打包 pkg/ 内容"
 
 msgid "  -s, --syncdeps   Install missing dependencies with pacman"
-msgstr "  -s, --syncdeps   使用pacman安装缺少的依赖关系"
+msgstr "  -s, --syncdeps   使用 pacman 安装缺少的依赖关系"
 
 msgid "      --asroot     Allow makepkg to run as root user"
-msgstr "      --asroot     允许makepkg作为root（根用户）运行"
+msgstr "      --asroot     允许makepkg作为 root（根用户）运行"
 
 msgid ""
 "      --holdver    Prevent automatic version bumping for development "
 "PKGBUILDs"
-msgstr "      --holdver    防止开发中的PKGBUILD自动更新版本"
+msgstr "      --holdver    防止开发中的 PKGBUILD 自动更新版本"
 
 msgid "      --source     Do not build package; generate a source-only tarball"
 msgstr "    --source     不编译软件包，仅仅生成源码包"
 
 msgid "These options can be passed to pacman:"
-msgstr "这些选项可以传递给pacman："
+msgstr "这些选项可以传递给 pacman："
 
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
@@ -1285,25 +1216,30 @@ msgid ""
 msgstr "      --noprogressbar  下载时不显示进度条"
 
 msgid "If -p is not specified, makepkg will look for '%s'"
-msgstr "如果没有指定 -p ，makepkg将寻找'%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"
+msgstr ""
+"Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\n这是免费软件；"
+"版权条款见源码\\n在法律许可下，不承担任何担保责任。\\n"
 
 msgid "%s not found."
 msgstr "%s 没有找到。"
 
-msgid "Sudo is used by default now. The --usesudo option is deprecated!"
-msgstr "现在默认使用sudo。--usesudo选项已不用！"
-
 msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr "\\0--holdver 和 --forcever 不能同时指定。"
 
 msgid "Cleaning up ALL files from %s."
-msgstr "正在从%s中清理所有文件。"
+msgstr "正在从 %s 中清理所有文件。"
 
 msgid "    Are you sure you wish to do this? [Y/n] "
 msgstr "    你确认要这样做吗？[Y/n]"
 
 msgid "Problem removing files; you may not have correct permissions in %s"
-msgstr "删除文件发生错误；在%s你可能没有正确的权限。"
+msgstr "删除文件发生错误；在 %s 你可能没有正确的权限。"
 
 msgid "Source cache cleaned."
 msgstr "源码缓存已清除。"
@@ -1312,46 +1248,46 @@ msgid "No files have been removed."
 msgstr "没有文件被删除。"
 
 msgid "Source destination must be defined in makepkg.conf."
-msgstr "必须在makepkg.conf中指定源码目标地。"
+msgstr "必须在 makepkg.conf 中指定源码目标地。"
 
 msgid "In addition, please run makepkg -C outside of your cache directory."
-msgstr "此外，请在你的缓存目录外运行makepkg -C。"
+msgstr "此外，请在你的缓存目录外运行 makepkg -C。"
 
 msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
-msgstr "BUILDSCRIPT 没有指定！确认你已经更新过%s。"
+msgstr "BUILDSCRIPT 没有指定！确认你已经更新过 %s。"
 
 msgid "Running makepkg as root is a BAD idea and can cause"
-msgstr "作为root（根用户）运行makepkg是个非常糟糕的主意，"
+msgstr "作为 root（根用户）运行 makepkg 是个非常糟糕的主意，"
 
 msgid "permanent, catastrophic damage to your system. If you"
 msgstr "可能会造成你的系统永远的，灾难性的损坏；"
 
 msgid "wish to run as root, please use the --asroot option."
-msgstr "如果你希望作为root（根用户）来运行，请使用--asroot选项。"
+msgstr "如果你希望作为 root（根用户）来运行，请使用--asroot选项。"
 
 msgid "The --asroot option is meant for the root user only."
-msgstr "--asroot选项仅针对root（根用户）。"
+msgstr "--asroot 选项仅针对 root（根用户）。"
 
 msgid "Please rerun makepkg without the --asroot flag."
-msgstr "请重新运行makepkg而不带--asroot参数。"
+msgstr "请重新运行 makepkg 而不带--asroot参数。"
 
 msgid "Fakeroot must be installed if using the 'fakeroot' option"
-msgstr "如果使用了'fakeroot'选项，必须安装fakeroot"
+msgstr "如果使用了 'fakeroot' 选项，必须安装 fakeroot"
 
 msgid "in the BUILDENV array in %s."
-msgstr "在%s的BUILDENV中。"
+msgstr "在 %s 的 BUILDENV 中。"
 
 msgid "Running makepkg as an unprivileged user will result in non-root"
-msgstr "作为非特权用户运行makepkg将导致打包文件的"
+msgstr "作为非特权用户运行 makepkg 将导致打包文件的"
 
 msgid "ownership of the packaged files. Try using the fakeroot environment by"
-msgstr "拥有者权限为非根用户。请尝试通过在makepkg.conf中的"
+msgstr "拥有者权限为非根用户。请尝试通过在 makepkg.conf 中的"
 
 msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
-msgstr "BUILDENV设置行中加入'fakeroot'来使用fakeroot环境。"
+msgstr "BUILDENV 设置行中加入 'fakeroot' 来使用 fakeroot 环境。"
 
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
-msgstr "不必使用'-F'选项。该选项仅仅供makepkg使用。"
+msgstr "不必使用'-F'选项。该选项仅仅供 makepkg 使用。"
 
 msgid "Cannot find the sudo binary! Is sudo installed?"
 msgstr "无法找到sudo命令！sudo是否已安装？"
@@ -1360,19 +1296,19 @@ msgid "Missing dependencies cannot be installed or removed as a normal user"
 msgstr "无法作为普通用户来安装或删除缺少的依赖关系"
 
 msgid "without sudo; install and configure sudo to auto-resolve dependencies."
-msgstr "没有sudo；请安装和配置sudo以自动解决依赖关系。"
+msgstr "没有 sudo；请安装和配置sudo以自动解决依赖关系。"
 
 msgid "%s does not exist."
-msgstr "%s不存在。"
+msgstr "%s 不存在。"
 
 msgid "%s is not allowed to be empty."
-msgstr "%s不允许为空。"
+msgstr "%s 不允许为空。"
 
 msgid "%s is not allowed to contain hyphens."
-msgstr "%s不允许含有连字号"
+msgstr "%s 不允许含有连字号"
 
 msgid "%s is not available for the '%s' architecture."
-msgstr "'%s'架构中没有%s。"
+msgstr "'%s '架构中没有 %s。"
 
 msgid "Note that many packages may need a line added to their %s"
 msgstr "注意许多软件包都需要添加一行到他们的%s"
@@ -1383,6 +1319,9 @@ msgstr "诸如arch=('%s')."
 msgid "Install scriptlet (%s) does not exist."
 msgstr "安装小脚本(%s)不存在。"
 
+msgid "options array contains unknown option '%s'"
+msgstr "选项组含有未知的选项 '%s'"
+
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现存的软件包..."
 
@@ -1399,7 +1338,7 @@ msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
 
 msgid "Running makepkg as root..."
-msgstr "正在作为root运行makepkg..."
+msgstr "正在作为 root 运行 makepkg..."
 
 msgid "Source package created: %s"
 msgstr "源码包已创建：%s"
@@ -1417,16 +1356,16 @@ msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
 
 msgid "pacman was not found in PATH; skipping dependency checks."
-msgstr "没有在指定路径找到pacman；跳过依赖关系检查。"
+msgstr "没有在指定路径找到 pacman；跳过依赖关系检查。"
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
-msgstr "跳过源码获取        -- 使用现存的src/"
+msgstr "跳过源码获取        -- 使用现存的 src/"
 
 msgid "Skipping source integrity checks -- using existing src/ tree"
-msgstr "跳过源码完整性检查 -- 使用现存的src/"
+msgstr "跳过源码完整性检查 -- 使用现存的 src/"
 
 msgid "Skipping source extraction       -- using existing src/ tree"
-msgstr "跳过源码解压缩       -- 使用现存的src/"
+msgstr "跳过源码解压缩       -- 使用现存的 src/"
 
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "源码目录为空，没有东西可编译。"
@@ -1438,10 +1377,10 @@ msgid "Sources are ready."
 msgstr "源码已准备好。"
 
 msgid "Removing existing pkg/ directory..."
-msgstr "正在删除现存的pkg/目录..."
+msgstr "正在删除现存的 pkg/ 目录..."
 
 msgid "Entering fakeroot environment..."
-msgstr "正在进入fakeroot环境..."
+msgstr "正在进入 fakeroot 环境..."
 
 msgid "Finished making: %s"
 msgstr "完成创建：%s"
@@ -1469,13 +1408,13 @@ msgstr ""
 "不用再在碟片上移来移去，从而可以读取得更快。\\n"
 
 msgid "diff tool was not found, please install diffutils."
-msgstr "diff工具没有找到，请安装diffutils。"
+msgstr "diff工具没有找到，请安装 diffutils。"
 
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr "发现Pacman锁文件。不能在pacman运行时再次运行。"
+msgstr "发现 Pacman 锁文件。不能在 pacman 运行时再次运行。"
 
 msgid "%s does not exist or is not a directory."
-msgstr "%s不存在或不是一个目录。"
+msgstr "%s 不存在或不是一个目录。"
 
 msgid "You must have correct permissions to optimize the database."
 msgstr "你必须拥有正确的权限才能优化数据库。"
@@ -1484,19 +1423,19 @@ msgid "ERROR: Can not create temp directory for database building."
 msgstr "错误：无法为数据库建立创建空目录。"
 
 msgid "MD5sum'ing the old database..."
-msgstr "正在为原数据库创建MD5校验值..."
+msgstr "正在为原数据库创建 MD5 校验值..."
 
 msgid "Tar'ing up %s..."
-msgstr "正在归档%s..."
+msgstr "正在打包 %s..."
 
 msgid "Tar'ing up %s failed."
-msgstr "归档%s失败。"
+msgstr "打包 %s 失败。"
 
 msgid "Making and MD5sum'ing the new db..."
-msgstr "正在生成新数据库及MD5校验值..."
+msgstr "正在生成新数据库及 MD5 校验值..."
 
 msgid "Untar'ing %s failed."
-msgstr "解包%s失败。"
+msgstr "解包 %s 失败。"
 
 msgid "Checking integrity..."
 msgstr "正在检查完整性..."
@@ -1508,171 +1447,127 @@ msgid "Putting the new database in place..."
 msgstr "正在把新的数据库放置到位..."
 
 msgid "Finished. Your pacman database has been optimized."
-msgstr "完毕。你的pacman数据库已经优化。"
+msgstr "完毕。你的 pacman 数据库已经优化。"
 
 msgid "For full benefits of pacman-optimize, run 'sync' now."
-msgstr "为了充分享受到pacman-optimize的好处，现在运行'sync' 吧。"
+msgstr "为了充分享受到 pacman-optimize 的好处，现在运行 'sync' 吧。"
+
+msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
+msgstr "用法：repo-add·[-q]·<path-to-db>·<package>·...\\n"
 
-msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
-msgstr "用法：%s <path-to-db> [--force] <package> ...\\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"
 msgstr ""
-"repo-add通过读取一个软件包文件来更新软件包数据库。\\n可以在命令行中指定添加多"
-"个软件包\\n\\n"
+"repo-add 通过读取一个软件包文件来更新软件包数据库。\\n可以在命令行中指定添加"
+"多个软件包\\n\\n"
 
 msgid ""
-"The --force flag will add a 'force' entry to the sync database, which"
-"\\ntells pacman to skip its internal version number checking and update"
-"\\nthe package regardless.\\n\\n"
+"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"
 msgstr ""
-"--force参数将在同步数据库中添加“强制”记录，\\n这将告诉pacman跳过内部的版本检"
-"查，\\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 标志将强制程序安静运行，除了\\nin·出现警告或错误。\\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"
 
+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 Aaron Griffin <aaron@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>.\\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"
 msgstr ""
-"Copyright (C) 2006 Aaron Griffin <aaron@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 "Invalid package file '%s'."
-msgstr "无效的软件包文件'%s'。"
-
-msgid "Removing existing package '%s'..."
-msgstr "正在删除现有的软件包'%s'..."
+msgstr "无效的软件包文件 '%s'。"
 
 msgid "Creating 'desc' db entry..."
-msgstr "正在生成'desc'数据库记录"
+msgstr "正在生成 'desc' 数据库记录"
 
 msgid "Computing md5 checksums..."
-msgstr "正在计算md5校验值..."
+msgstr "正在计算 md5 校验值..."
 
 msgid "Creating 'depends' db entry..."
-msgstr "正在生成'depends'数据库记录..."
+msgstr "正在生成 'depends' 数据库记录..."
 
 msgid "Creating 'deltas' db entry..."
-msgstr "正在生成'deltas'数据库记录..."
+msgstr "正在生成 'deltas' 数据库记录..."
 
 msgid "Added delta '%s'"
 msgstr "已添加delta '%s'"
 
 msgid "Could not add delta '%s'"
-msgstr "无法添加delta '%s'"
+msgstr "无法添加 delta '%s'"
+
+msgid "Removing existing package '%s'..."
+msgstr "正在删除现有的软件包'%s'..."
+
+msgid "Either realpath or readlink are required by repo-add."
+msgstr "repo-add 要求 realpath 或 readlink 其中一个。"
 
 msgid "%s not found. Cannot continue."
-msgstr "%s没有找到。无法继续。"
+msgstr "%s 没有找到。无法继续。"
 
 msgid "Cannot create temp directory for database building."
 msgstr "无法为建立数据库创建空目录。"
 
+msgid "Invalid command name '%s' specified."
+msgstr "指定了无效的 '%s' 命令行名字"
+
+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 "Repository file '%s' is not a proper pacman database."
-msgstr "库文件'%s'不是一个有效的pacman数据库。"
+msgstr "库文件 '%s' 不是一个有效的pacman数据库。"
 
 msgid "Extracting database to a temporary location..."
 msgstr "正在解压缩数据库到一个临时目录..."
 
+msgid "Repository file '%s' was not found."
+msgstr "软件仓库文件 '%s' 没有找到"
+
 msgid "'%s' is not a package file, skipping"
-msgstr "'%s'不是一个软件包文件，跳过"
+msgstr "'%s' 不是一个软件包文件，跳过"
 
 msgid "Adding package '%s'"
-msgstr "正在添加软件包'%s'"
+msgstr "正在添加软件包 '%s'"
 
 msgid "Package '%s' not found."
-msgstr "软件包'%s'没有找到。"
-
-msgid "Creating updated database file %s"
-msgstr "正在生成更新的数据库文件%s"
-
-msgid "No compression set."
-msgstr "没有设置压缩。"
-
-msgid "No packages modified, nothing to do."
-msgstr "没有软件包被修改，无事可做。"
-
-msgid "repo-remove %s\\n\\n"
-msgstr "repo-remove %s\\n\\n"
-
-msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
-msgstr "用法：%s <path-to-db> <packagename> ...\\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"
-msgstr ""
-"repo-remove通过从给定的库数据库中删除\\n在命令行中指定的软件包名来更新某个软"
-"件包数据库。\\n可在命令行中指定同时删除多个软件包。\\n\\n"
-
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "例子：repo-remove /path/to/repo.db.tar.gz kernel26"
+msgstr "软件包 '%s' 没有找到。"
 
 msgid "Searching for package '%s'..."
-msgstr "正在搜索软件包'%s..."
+msgstr "正在搜索软件包 '%s'..."
 
 msgid "Package matching '%s' not found."
-msgstr "没有找到符合'%s'的软件包。"
-
-msgid "Creating updated database file '%s'..."
-msgstr "正在生成更新的数据库文件 '%s'..."
-
-msgid "All packages have been removed from the database. Deleting '%s'."
-msgstr "所有软件包已经从数据库中删除。正在删除'%s'。"
-
-msgid "Usage: %s <action> <destfile> <option> [package_directory]"
-msgstr "用法：%s <action> <destfile> <option> [package_directory]"
-
-msgid ""
-"updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
-"the destfile. updatesync updates the database in a temporary\\ndirectory and "
-"then compresses it to <destfile>.\\n\\n"
-msgstr ""
-"updatesync将通过读取某个PKGBUILD或修改destfile来更新\\n一个同步数据库。"
-"updatesync 先在一个临时目录中更新数据库，\\n然后在压缩到<destfile>.\\n\\n"
-
-msgid "There are two types of actions:\\n\\n"
-msgstr "有两种行为：\\n\\n"
+msgstr "没有找到符合 '%s' 的软件包。"
 
-msgid ""
-"upd - Will update a package's entry or create it if it doesn't exist."
-"\\n      It takes the package's PKGBUILD as an option.\\n"
-msgstr ""
-"upd - 将更新某个软件包记录，如果不存在则创建。\\n      它把软件包的PKGBUILD作"
-"为一个选项。\\n"
-
-msgid ""
-"del - Will remove a package's entry from the db. It takes the package's"
-"\\n      name as an option.\\n"
-msgstr ""
-"del - 将从数据库中删除某个软件包记录。它把软件包\\n      名字作为一个选项。"
-"\\n"
-
-msgid ""
-"updatesync will calculate md5sums of packages in the same directory as"
-"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
-msgstr ""
-"updatesync将计算同一目录下的软件包md5值\\n作为<destfile>，除非指定了另外的[软"
-"件包e_目录]\\n\\n"
-
-msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
-msgstr "例子：updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
+msgid "Creating updated database file '%s'"
+msgstr "正在生成更新的数据库文件 '%s'"
 
-msgid ""
-"Copyright (C) 2004 Jason Chu <jason@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 ""
-"Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\n这是一个免费软件；版"
-"权条款见源码。\\n在法律许可下，不承担任何担保责任。\\n"
+msgid "No compression set."
+msgstr "没有设置压缩。"
 
-msgid "%s not found"
-msgstr "%s没有找到"
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "所有软件包已经从数据库中删除。正在删除 '%s'。"
 
-msgid "could not find %s-%s-%s-%s%s - aborting"
-msgstr "无法找到%s-%s-%s-%s%s - 放弃"
+msgid "No packages modified, nothing to do."
+msgstr "没有软件包被修改，无事可做。"