Merge branch 'maint'

4 files changed, 111 insertions, 92 deletions

diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim
index 179f40bf..8f45ae44 100644
--- a/contrib/PKGBUILD.vim
+++ b/contrib/PKGBUILD.vim
@@ -57,7 +57,7 @@ syn keyword pb_k_license license contained
 syn keyword pbLicense  APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained
 syn match pbLicenseCustom /custom\(:[[:alnum:]]*\)*/ contained
 syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense
-syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense,shDoubleQuote,shSingleQuote
+syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense
 
 " backup
 syn keyword pb_k_backup backup contained
@@ -67,8 +67,8 @@ syn region pbBackupGroup start=/^backup=(/ end=/)/ contains=pb_k_backup,pbValidB
 " arch
 syn keyword pb_k_arch arch contained
 syn keyword pbArch i686 x86_64 ppc contained
-syn match pbIllegalArch /[^='() ]/ contained contains=pbArch
-syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch,shDoubleQuote,shSingleQuote
+syn match pbIllegalArch /[^='"() ]/ contained contains=pbArch
+syn region pbArchGroup start=/^arch=(/ end=/)/ contains=pb_k_arch,pbArch,pbIllegalArch
 
 " groups
 syn keyword pb_k_groups groups contained
@@ -131,7 +131,7 @@ hi def link pbDerefEmulation PreProc
 syn keyword pb_k_md5sums md5sums contained
 syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums
 syn match pbValidMd5sums /[[:alnum:]]\{32\}/ contained
-syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums
+syn region pbMd5sumsGroup start=/^md5sums/ end=/)/ contains=pb_k_md5sums,pbMd5Quotes,pbMd5Hash,pbIllegalMd5sums keepend
 syn match pbMd5Quotes /'.*'\|".*"/ contained contains=pbMd5Hash,pbIllegalMd5sums
 syn match pbMd5Hash /[[:alnum:]]\+/ contained contains=pbValidMd5sums
 hi def link pbMd5Quotes Keyword
@@ -142,7 +142,7 @@ hi def link pbValidMd5sums  Number
 syn keyword pb_k_sha1sums sha1sums contained
 syn match pbIllegalSha1sums /[^='"()\/ ]/ contained contains=pbValidSha1sums
 syn match pbValidSha1sums /[[:alnum:]]\{40\}/ contained
-syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums
+syn region pbSha1sumsGroup start=/^sha1sums/ end=/)/ contains=pb_k_sha1sums,pbSha1Quotes,pbSha1Hash,pbIllegalSha1sums keepend
 syn match pbSha1Quotes /'.*'\|".*"/ contained contains=pbSha1Hash,pbIllegalSha1sums
 syn match pbSha1Hash /[[:alnum:]]\+/ contained contains=pbValidSha1sums
 hi def link pbSha1Quotes Keyword
diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt
index 12df824f..3cdd2906 100644
--- a/doc/pacman.conf.5.txt
+++ b/doc/pacman.conf.5.txt
@@ -106,8 +106,9 @@ Options
 
 *NoUpgrade =* file ...::
 	All files listed with a `NoUpgrade` directive will never be touched during
-	a package install/upgrade. Do not include the leading slash when specifying
-	files.
+	a package install/upgrade.
+	These files refer to files in the package archive, so do not include the
+	leading slash (the RootDir) when specifying them.
 
 *NoExtract =* file ...::
 	All files listed with a `NoExtract` directive will never be extracted from
@@ -115,6 +116,8 @@ Options
 	of a package to be installed. For example, if your httpd root uses an
 	'index.php', then you would not want the 'index.html' file to be extracted
 	from the 'apache' package.
+	These files refer to files in the package archive, so do not include the
+	leading slash (the RootDir) when specifying them.
 
 *UseSyslog*::
 	Log action messages through syslog(). This will insert log entries into
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 351d23f4..582fe942 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -16,6 +16,20 @@
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options (all disabled by default)
+#NoPassiveFtp
+#UseSyslog
+#ShowSize
+#UseDelta
+#TotalDownload
+
 #
 # REPOSITORIES
 #   - can be defined here or included from another file
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 756fdc1b..fbc4c7aa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.1.2\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-03-03 21:09+0100\n"
-"Last-Translator: 甘露（Gan Lu） <rhythm.gan@gmail.com>\n"
+"PO-Revision-Date: 2008-03-13 09:51+0700\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"
@@ -33,8 +33,8 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
 msgstr ""
-"  如果你确认软件包管理器已经没有\n"
-"  运行，你可以删除 %s。\n"
+"  如果你确认软件包管理器没有正在\n"
+"  运行，你可以删除%s。\n"
 
 #, c-format
 msgid "loading package data...\n"
@@ -70,7 +70,7 @@ msgid ""
 "errors occurred, no packages were upgraded.\n"
 msgstr ""
 "\n"
-"发生错误，没有软件包进行更新\n"
+"发生错误，没有软件包被更新\n"
 
 #, c-format
 msgid "error: failed to commit transaction (%s)\n"
@@ -78,7 +78,7 @@ msgstr "错误：无法交付处理(%s)\n"
 
 #, c-format
 msgid "checking dependencies...\n"
-msgstr "正在检查倚赖关系……\n"
+msgstr "正在检查依赖关系……\n"
 
 #, c-format
 msgid "checking for file conflicts...\n"
@@ -86,7 +86,7 @@ msgstr "正在检查文件冲突……\n"
 
 #, c-format
 msgid "resolving dependencies...\n"
-msgstr "正在解决倚赖关系……\n"
+msgstr "正在解决依赖关系……\n"
 
 #, c-format
 msgid "looking for inter-conflicts...\n"
@@ -94,15 +94,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"
@@ -118,7 +118,7 @@ msgstr "正在应用deltas……\n"
 
 #, c-format
 msgid "generating %s with %s... "
-msgstr "正在使用 %s 生成%s……"
+msgstr "正在使用%s生成%s……"
 
 #, c-format
 msgid "success!\n"
@@ -130,43 +130,45 @@ 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] "
 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] "
-msgstr ":: %s列在IgnorePkg/IgnoreGroup中。无论如何都进行安装吗?[Y/n]"
+msgstr ""
+":: %s列在IgnorePkg/IgnoreGroup（忽略软件包／忽略软件包组）中。真的确定要安装"
+"吗?[Y/n]"
 
 #, c-format
 msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s是作为HoldPkg指定的。无论如何都删除吗？[Y/n]"
+msgstr ":: %s是作为HoldPkg（保留软件包）指定的。真的确定要删除吗？[Y/n]"
 
 #, c-format
 msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: 用 %s/%s 替代 %s？[Y/n]"
+msgstr ":: 用%s/%s替代%s？[Y/n]"
 
 #, c-format
 msgid "Replacing %s with %s/%s\n"
-msgstr "正在用 %s/%s 替代 %s\n"
+msgstr "正在用 %s/%s替代%s\n"
 
 #, c-format
 msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: %s 与 %s 有冲突。删除 %s？[Y/n]"
+msgstr ":: %s与%s有冲突。删除%s？[Y/n]"
 
 #, c-format
 msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s：本地版本较新。无论如何都升级吗？[Y/n]"
+msgstr ":: %s-%s：本地版本较新。真的确定要更新吗？[Y/n]"
 
 #, c-format
 msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: 文件 %s 已经损坏。你想要删除它吗？[Y/n]"
+msgstr ":: 文件%s已经损坏。你想要删除它吗？[Y/n]"
 
 #, c-format
 msgid "installing"
@@ -174,7 +176,7 @@ msgstr "正在安装"
 
 #, c-format
 msgid "upgrading"
-msgstr "生在升级"
+msgstr "正在进行更新"
 
 #, c-format
 msgid "removing"
@@ -190,7 +192,7 @@ msgstr "单独指定安装"
 
 #, c-format
 msgid "Installed as a dependency for another package"
-msgstr "已经作为其他软件包的倚赖关系安装"
+msgstr "已经作为其他软件包的依赖关系安装"
 
 #, c-format
 msgid "Unknown"
@@ -226,11 +228,11 @@ msgstr "提供　　　："
 
 #, c-format
 msgid "Depends On     :"
-msgstr "倚赖于　　："
+msgstr "依赖于　　："
 
 #, c-format
 msgid "Optional Deps  :"
-msgstr "可选倚赖　："
+msgstr "可选依赖　："
 
 #, c-format
 msgid "Required By    :"
@@ -306,7 +308,7 @@ msgstr "备份文件：\n"
 
 #, c-format
 msgid "error: could not calculate checksums for %s\n"
-msgstr "错误：无法计算 %s 的完整性检查值\n"
+msgstr "错误：无法计算%s的完整性校验值\n"
 
 #, c-format
 msgid "MODIFIED\t%s\n"
@@ -362,7 +364,7 @@ msgstr "      --asdeps         作为非单独指定安装的软件包安装\n"
 
 #, c-format
 msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         略过倚赖关系检查\n"
+msgstr "  -d, --nodeps         略过依赖关系检查\n"
 
 #, c-format
 msgid "  -f, --force          force install, overwrite conflicting files\n"
@@ -371,7 +373,7 @@ msgstr "  -f,  -force          强制安装，覆盖存在冲突的文件\n"
 #, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr "  -c, --cascade        删除软件包及所有的倚赖于此的软件包\n"
+msgstr "  -c, --cascade        删除软件包及所有的依赖于此的软件包\n"
 
 #, c-format
 msgid ""
@@ -385,7 +387,7 @@ msgstr "  -n, --nosave         同时删除配置文件\n"
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
-msgstr "  -s, --recursive      同时删除（不会破坏其他软件包的）倚赖关系\n"
+msgstr "  -s, --recursive      同时删除（不会破坏其他软件包的）依赖关系\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -393,7 +395,7 @@ msgstr "  -c, --changelog      查看某软件包的更新日志\n"
 
 #, c-format
 msgid "  -d, --deps           list all packages installed as dependencies\n"
-msgstr "  -d, --deps           列出所有作为倚赖关系安装的软件包\n"
+msgstr "  -d, --deps           列出所有作为依赖关系安装的软件包\n"
 
 #, c-format
 msgid "  -e, --explicit       list all packages explicitly installed\n"
@@ -530,7 +532,7 @@ msgstr "      --noprogressbar  下载文件时不显示进度条\n"
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr "      --noscriptlet    不执行安装脚本\n"
+msgstr "      --noscriptlet    不执行安装小脚本\n"
 
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
@@ -606,7 +608,7 @@ msgstr "初始化alpm库失败(%s)\n"
 
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr "非根用户无法执行指定操作。\n"
+msgstr "非root（根用户）无法执行指定操作。\n"
 
 #, c-format
 msgid "could not register 'local' database (%s)\n"
@@ -634,7 +636,7 @@ msgstr "错误：无法确定'%s': %s的真实路径。\n"
 
 #, c-format
 msgid "%s is owned by %s %s\n"
-msgstr "%s 属于%s %s\n"
+msgstr "%s属于%s %s\n"
 
 #, c-format
 msgid "error: No package owns %s\n"
@@ -662,7 +664,7 @@ msgstr "错误：软件包\"%s\"没有找到\n"
 
 #, c-format
 msgid ":: group %s:\n"
-msgstr ":: 组 %s:\n"
+msgstr ":: 组%s:\n"
 
 #, c-format
 msgid "    Remove whole content? [Y/n] "
@@ -670,11 +672,11 @@ msgstr "    删除全部内容？[Y/n]"
 
 #, c-format
 msgid ":: Remove %s from group %s? [Y/n] "
-msgstr ":: 删除%s从组%s中？[Y/n]"
+msgstr ":: 从组%s中删除%s吗？[Y/n]"
 
 #, c-format
 msgid "error: failed to init transaction (%s)\n"
-msgstr "错误：无法初始化处理(%s)\n"
+msgstr "错误：无法初始化事务处理(%s)\n"
 
 #, c-format
 msgid "Targets:"
@@ -770,7 +772,7 @@ msgstr "错误：软件仓库'%s'不存在\n"
 
 #, c-format
 msgid "error: package '%s' was not found in repository '%s'\n"
-msgstr "错误：软件包'%s'没有在'%s'库里找到\n"
+msgstr "错误：软件包'%s'没有在'%s'软件仓库里找到\n"
 
 #, c-format
 msgid "error: package '%s' was not found\n"
@@ -790,7 +792,7 @@ msgstr "错误：无法同步任何数据库\n"
 
 #, c-format
 msgid ":: Starting full system upgrade...\n"
-msgstr ":: 正在进行全系统升级……\n"
+msgstr ":: 正在进行全系统更新……\n"
 
 #, c-format
 msgid ":: pacman has detected a newer version of itself.\n"
@@ -818,7 +820,7 @@ msgstr ":: 安装全部内容？[Y/n]"
 
 #, c-format
 msgid ":: Install %s from group %s? [Y/n] "
-msgstr ":: 安装%s从软件包组%s？[Y/n]"
+msgstr ":: 从软件包组%s安装%s吗？[Y/n]"
 
 #, c-format
 msgid "Warning: %s provides %s\n"
@@ -854,7 +856,7 @@ msgstr "进行安装吗？[Y/n]"
 
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
-msgstr "发生错误，没有软件包进行了更新。\n"
+msgstr "发生错误，没有软件包被更新。\n"
 
 #, c-format
 msgid "None\n"
@@ -957,13 +959,13 @@ msgstr ""
 "版权条款见源码\\n不提供任何法律规定的担保。\\n"
 
 msgid "%s not found. Can not continue."
-msgstr "%s 没有找到。无法继续。"
+msgstr "%s没有找到。无法继续。"
 
 msgid "invalid root dir: %s"
 msgstr "无效的根目录：%s"
 
 msgid "gensync: building database entries, generating md5sums..."
-msgstr "gensync：正在创建数据库记录，正在生成md5值……"
+msgstr "gensync：正在创建数据库记录，正在生成md5校验值……"
 
 msgid "failed to parse %s"
 msgstr "无法处理：%s"
@@ -986,7 +988,7 @@ msgstr "正在清理……"
 msgid ""
 "Options beginning with 'no' will be deprecated in the next version of "
 "makepkg!"
-msgstr "开始于'no'的选项将在makepkg的下个版本中放弃。"
+msgstr "以no开头的选项将在makepkg的下个版本中被放弃。"
 
 msgid "Please replace 'no' with '!': %s -> %s."
 msgstr "请用'!'代替'no'：%s -> %s"
@@ -998,7 +1000,7 @@ msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "没有设置程序来处理%s URLs。检查%s。"
 
 msgid "Aborting..."
-msgstr "正在中断……"
+msgstr "正在放弃……"
 
 msgid "The download program %s is not installed."
 msgstr "下载的程序%s没有被安装。"
@@ -1019,7 +1021,7 @@ 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' 。"
+msgstr "无法在%s下面找到'%s' 。"
 
 msgid "Failed to build '%s'"
 msgstr "无法编译'%s'"
@@ -1112,7 +1114,7 @@ msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "正在从二进制执行文件和库中删除debug符号……"
 
 msgid "Removing libtool .la files..."
-msgstr "正在删除libtool .la 文件……"
+msgstr "正在删除libtool .la文件……"
 
 msgid "Removing empty directories..."
 msgstr "正在删除空目录……"
@@ -1208,7 +1210,7 @@ msgid "Options:"
 msgstr "选项："
 
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
-msgstr "  -A, --ignorearch 忽略%s中的不完全的arch段"
+msgstr "  -A, --ignorearch 忽略%s中的不完整的架构段"
 
 msgid "  -b, --builddeps  Build missing dependencies from source"
 msgstr "  -b, --builddeps  从源码编译缺少的依赖关系"
@@ -1260,12 +1262,12 @@ msgid "  -s, --syncdeps   Install missing dependencies with 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     不编译软件包，仅仅生成源码包"
@@ -1289,7 +1291,7 @@ msgid "%s not found."
 msgstr "%s 没有找到。"
 
 msgid "Sudo is used by default now. The --usesudo option is deprecated!"
-msgstr "现在默认使用sudo。--usesudo选项将逐步放弃！"
+msgstr "现在默认使用sudo。--usesudo选项已不用！"
 
 msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr "\\0--holdver 和 --forcever 不能同时指定。"
@@ -1310,31 +1312,31 @@ 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 "你的系统永远的，灾难性的损坏；如果你"
+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参数。"
 
 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中。"
@@ -1346,10 +1348,10 @@ msgid "ownership of the packaged files. Try using the fakeroot environment by"
 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是否已安装？"
@@ -1361,16 +1363,16 @@ msgid "without sudo; install and configure sudo to auto-resolve dependencies."
 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"
@@ -1379,7 +1381,7 @@ msgid "such as arch=('%s')."
 msgstr "诸如arch=('%s')."
 
 msgid "Install scriptlet (%s) does not exist."
-msgstr "安装脚本(%s)不存在。"
+msgstr "安装小脚本(%s)不存在。"
 
 msgid "A package has already been built, installing existing package..."
 msgstr "已有一个编译好的软件包，正在安装现存的软件包……"
@@ -1391,7 +1393,7 @@ msgid "Skipping build."
 msgstr "跳过编译。"
 
 msgid "Leaving fakeroot environment."
-msgstr "正在离开fakeroot环境。"
+msgstr "正在退出fakeroot环境。"
 
 msgid "Making package: %s"
 msgstr "正在创建软件包：%s"
@@ -1427,10 +1429,10 @@ msgid "Skipping source extraction       -- using existing src/ tree"
 msgstr "跳过源码解压缩       -- 使用现存的src/"
 
 msgid "The source directory is empty, there is nothing to build!"
-msgstr "源码目录为空，没有东东可编译。"
+msgstr "源码目录为空，没有东西可编译。"
 
 msgid "The package directory is empty, there is nothing to repackage!"
-msgstr "源码目录为空，没有东东可打包。"
+msgstr "源码目录为空，没有东西可打包。"
 
 msgid "Sources are ready."
 msgstr "源码已准备好。"
@@ -1451,8 +1453,8 @@ msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
 msgstr ""
-"pacman-optimize 是一个小hack，它可以提高pacman\\n读取/写入它基于文件系统的数"
-"据库时的表现\\n\\n"
+"pacman-optimize是一个小hack，它可以提高pacman\\n读取/写入它基于文件系统的数据"
+"库时的表现\\n\\n"
 
 msgid ""
 "Because pacman uses many small files to keep track of packages,\\nthere is a "
@@ -1470,28 +1472,28 @@ msgid "diff tool was not found, please install 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不存在或不是一个目录。"
 
 msgid "You must have correct permissions to optimize the database."
-msgstr "必须拥有正确的权限才能优化数据库。"
+msgstr "你必须拥有正确的权限才能优化数据库。"
 
 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失败。"
@@ -1500,7 +1502,7 @@ msgid "Checking integrity..."
 msgstr "正在检查完整性……"
 
 msgid "Integrity check FAILED, reverting to old database."
-msgstr "完整性检查失败，恢复到老数据库。"
+msgstr "完整性检查失败，恢复到原数据库。"
 
 msgid "Putting the new database in place..."
 msgstr "正在把新的数据库放置到位……"
@@ -1538,7 +1540,7 @@ msgid ""
 "the extent permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\n这是一个免费软"
-"件；版权条款见源码。\\n不提供任何法律所规定的保证\\n"
+"件；版权条款见源码。\\n不提供担保，除非法律不允许\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "无效的软件包文件'%s'。"
@@ -1550,7 +1552,7 @@ msgid "Creating 'desc' db entry..."
 msgstr "正在生成'desc'数据库记录"
 
 msgid "Computing md5 checksums..."
-msgstr "正在计算md5检查值……"
+msgstr "正在计算md5校验值……"
 
 msgid "Creating 'depends' db entry..."
 msgstr "正在生成'depends'数据库记录……"
@@ -1565,7 +1567,7 @@ msgid "Could not add delta '%s'"
 msgstr "无法添加delta '%s'"
 
 msgid "%s not found. Cannot continue."
-msgstr "%s 没有找到。无法继续。"
+msgstr "%s没有找到。无法继续。"
 
 msgid "Cannot create temp directory for database building."
 msgstr "无法为建立数据库创建空目录。"
@@ -1577,7 +1579,7 @@ msgid "Extracting database to a temporary location..."
 msgstr "正在解压缩数据库到一个临时目录……"
 
 msgid "'%s' is not a package file, skipping"
-msgstr "'%s' 不是一个软件包文件，跳过"
+msgstr "'%s'不是一个软件包文件，跳过"
 
 msgid "Adding package '%s'"
 msgstr "正在添加软件包'%s'"
@@ -1615,7 +1617,7 @@ msgid "Searching for package '%s'..."
 msgstr "正在搜索软件包'%s……"
 
 msgid "Package matching '%s' not found."
-msgstr "符合'%s'的软件包没有找到。"
+msgstr "没有找到符合'%s'的软件包。"
 
 msgid "Creating updated database file '%s'..."
 msgstr "正在生成更新的数据库文件 '%s'……"
@@ -1631,7 +1633,7 @@ msgid ""
 "the destfile. updatesync updates the database in a temporary\\ndirectory and "
 "then compresses it to <destfile>.\\n\\n"
 msgstr ""
-"updatesync 将通过读取某个PKGBUILD或修改destfile来更新\\n一个同步数据库。"
+"updatesync将通过读取某个PKGBUILD或修改destfile来更新\\n一个同步数据库。"
 "updatesync 先在一个临时目录中更新数据库，\\n然后在压缩到<destfile>.\\n\\n"
 
 msgid "There are two types of actions:\\n\\n"
@@ -1667,10 +1669,10 @@ msgid ""
 "the extent permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\\n\\n这是一个免费软件；版"
-"权条款见源码。\\n不提供任何法律所规定的保证\\n"
+"权条款见源码。\\n不提供担保，除非法律不允许\\n"
 
 msgid "%s not found"
-msgstr "%s 没有找到"
+msgstr "%s没有找到"
 
 msgid "could not find %s-%s-%s-%s%s - aborting"
 msgstr "无法找到%s-%s-%s-%s%s - 放弃"