Merge branch 'maint'

1 files changed, 89 insertions, 89 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fbc4c7aa..e86ace45 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-13 09:51+0700\n"
-"Last-Translator: 甘露 (Lu Gan) <rhythm.gan@gmail.com>\n"
+"PO-Revision-Date: 2008-05-16 12:50+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"
@@ -26,23 +26,23 @@ msgstr "没有指定目标（使用 -h 获取帮助）\n"
 
 #, c-format
 msgid "error: %s\n"
-msgstr "错误： %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"
+"  如果你确认软件包管理器没有正在运行，\n"
+"  你可以删除%s。\n"
 
 #, c-format
 msgid "loading package data...\n"
-msgstr "正在装载软件包数据……\n"
+msgstr "正在装载软件包数据...\n"
 
 #, c-format
 msgid "error: '%s': %s\n"
-msgstr "错误：'%s'： %s\n"
+msgstr "错误：'%s': %s\n"
 
 #, c-format
 msgid "error: failed to prepare transaction (%s)\n"
@@ -78,47 +78,47 @@ msgstr "错误：无法交付处理(%s)\n"
 
 #, c-format
 msgid "checking dependencies...\n"
-msgstr "正在检查依赖关系……\n"
+msgstr "正在检查依赖关系...\n"
 
 #, c-format
 msgid "checking for file conflicts...\n"
-msgstr "正在检查文件冲突……\n"
+msgstr "正在检查文件冲突...\n"
 
 #, c-format
 msgid "resolving dependencies...\n"
-msgstr "正在解决依赖关系……\n"
+msgstr "正在解决依赖关系...\n"
 
 #, c-format
 msgid "looking for inter-conflicts...\n"
-msgstr "正在查找内部冲突……\n"
+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"
-msgstr "正在检查软件包完整性……\n"
+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,7 +130,7 @@ msgstr "失败。\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: 正在从%s软件仓库获取软件包……\n"
+msgstr ":: 正在从%s软件仓库获取软件包...\n"
 
 #, c-format
 msgid ""
@@ -212,7 +212,7 @@ msgstr "版本　　　："
 
 #, c-format
 msgid "URL            :"
-msgstr "ＵＲＬ　　："
+msgstr "URL地址　："
 
 #, c-format
 msgid "Licenses       :"
@@ -292,11 +292,11 @@ msgstr "否"
 
 #, c-format
 msgid "MD5 Sum        :"
-msgstr "ＭＤ５值　："
+msgstr "MD5校验值："
 
 #, c-format
 msgid "Description    : "
-msgstr "描述　　　： "
+msgstr "描述　　　："
 
 #, c-format
 msgid "Repository     :"
@@ -328,7 +328,7 @@ msgstr "（无）\n"
 
 #, c-format
 msgid "error: no changelog available for '%s'.\n"
-msgstr "错误： '%s'没有可获得的更新日志。\n"
+msgstr "错误: '%s'没有可获得的更新日志。\n"
 
 #, c-format
 msgid "options"
@@ -648,7 +648,7 @@ msgstr "错误：没有找到\"%s\"组\n"
 
 #, c-format
 msgid "Checking for package upgrades... \n"
-msgstr "正在检查软件包更新……\n"
+msgstr "正在检查软件包更新...\n"
 
 #, c-format
 msgid "no upgrades found.\n"
@@ -724,7 +724,7 @@ msgstr "打算从缓存中删除没有安装的软件包吗？[Y/n]"
 
 #, c-format
 msgid "removing old packages from cache... "
-msgstr "正在从缓存中删除旧软件包……"
+msgstr "正在从缓存中删除旧软件包..."
 
 #, c-format
 msgid "error: could not access cache directory\n"
@@ -740,7 +740,7 @@ msgstr "打算从缓存中删除所有软件包吗？[Y/n]"
 
 #, c-format
 msgid "removing all packages from cache... "
-msgstr "正在从缓存中删除所有软件包……"
+msgstr "正在从缓存中删除所有软件包..."
 
 #, c-format
 msgid "error: could not remove cache directory\n"
@@ -784,7 +784,7 @@ msgstr "错误：软件仓库\"%s\"没有找到\n"
 
 #, c-format
 msgid ":: Synchronizing package databases...\n"
-msgstr ":: 正在同步软件包数据库……\n"
+msgstr ":: 正在同步软件包数据库...\n"
 
 #, c-format
 msgid "error: failed to synchronize any databases\n"
@@ -792,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"
@@ -840,7 +840,7 @@ msgstr "本地数据库已是最新的\n"
 
 #, c-format
 msgid "Beginning download...\n"
-msgstr "开始下载……\n"
+msgstr "开始下载...\n"
 
 #, c-format
 msgid "Proceed with download? [Y/n] "
@@ -848,7 +848,7 @@ msgstr "进行下载吗？[Y/n]"
 
 #, c-format
 msgid "Beginning upgrade process...\n"
-msgstr "开始更新……\n"
+msgstr "开始更新...\n"
 
 #, c-format
 msgid "Proceed with installation? [Y/n] "
@@ -868,15 +868,15 @@ msgstr "删除："
 
 #, c-format
 msgid "Total Removed Size:   %.2f MB\n"
-msgstr "全部删除大小：   %.2f MB\n"
+msgstr "全部删除大小:   %.2f MB\n"
 
 #, c-format
 msgid "Total Download Size:    %.2f MB\n"
-msgstr "全部下载大小：   %.2f MB\n"
+msgstr "全部下载大小:   %.2f MB\n"
 
 #, c-format
 msgid "Total Installed Size:   %.2f MB\n"
-msgstr "全部安装大小：  %.2f MB\n"
+msgstr "全部安装大小:  %.2f MB\n"
 
 #, c-format
 msgid "Y"
@@ -956,7 +956,7 @@ msgid ""
 "the extent permitted by law.\\n"
 msgstr ""
 "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\n这是免费软件；"
-"版权条款见源码\\n不提供任何法律规定的担保。\\n"
+"版权条款见源码\\n在法律许可下，不承担任何担保责任。\\n"
 
 msgid "%s not found. Can not continue."
 msgstr "%s没有找到。无法继续。"
@@ -965,7 +965,7 @@ 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"
@@ -974,7 +974,7 @@ msgid "could not find %s-%s-%s-%s%s - skipping"
 msgstr "无法找到%s-%s-%s-%s%s - 跳过"
 
 msgid "creating repo DB..."
-msgstr "正在产生库DB……"
+msgstr "正在产生库DB..."
 
 msgid "WARNING:"
 msgstr "警告："
@@ -983,7 +983,7 @@ msgid "ERROR:"
 msgstr "错误："
 
 msgid "Cleaning up..."
-msgstr "正在清理……"
+msgstr "正在清理..."
 
 msgid ""
 "Options beginning with 'no' will be deprecated in the next version of "
@@ -1000,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没有被安装。"
@@ -1009,13 +1009,13 @@ msgid "Pacman returned a fatal error (%i): %s"
 msgstr "Pacman出现致命错误(%i):：%s"
 
 msgid "Installing missing dependencies..."
-msgstr "正在安装缺少的依赖关系……"
+msgstr "正在安装缺少的依赖关系..."
 
 msgid "Pacman failed to install missing dependencies."
-msgstr "Pacman无法安装缺少的依赖关系……"
+msgstr "Pacman无法安装缺少的依赖关系..."
 
 msgid "Building missing dependencies..."
-msgstr "正在创建缺少的依赖关系……"
+msgstr "正在创建缺少的依赖关系..."
 
 msgid "Source root cannot be found - please make sure it is specified in %s."
 msgstr "源码根目录没有找到－清确认已在%s指定。"
@@ -1033,7 +1033,7 @@ msgid "Missing Dependencies:"
 msgstr "缺少依赖关系："
 
 msgid "Retrieving Sources..."
-msgstr "获取源代码……"
+msgstr "获取源代码..."
 
 msgid "You do not have write permission to store downloads in %s."
 msgstr "你没有写权力把下载存放在%s"
@@ -1048,13 +1048,13 @@ msgid "%s was not found in the build directory and is not a URL."
 msgstr "%s没有在创建目录中找到，也不是一个URL。"
 
 msgid "Downloading %s..."
-msgstr "正在下载%s……"
+msgstr "正在下载%s..."
 
 msgid "Failure while downloading %s"
 msgstr "无法下载%s"
 
 msgid "Generating checksums for source files..."
-msgstr "正在为源代码文件创建完整性检查值……"
+msgstr "正在为源代码文件创建完整性检查值..."
 
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "指定了无效的'%s'完整性编码"
@@ -1069,7 +1069,7 @@ msgid "Invalid integrity algorithm '%s' specified"
 msgstr "指定了无效的'%s' 完整性编码"
 
 msgid "Validating source files with %s..."
-msgstr "正在检查源码完整性%s……"
+msgstr "正在检查源码完整性%s..."
 
 msgid "NOT FOUND"
 msgstr "没有找到"
@@ -1087,7 +1087,7 @@ msgid "Integrity checks (%s) are missing or incomplete."
 msgstr "完整性检查(%s)去少或者不完全"
 
 msgid "Extracting Sources..."
-msgstr "解压缩源码……"
+msgstr "解压缩源码..."
 
 msgid "Unable to find source file %s for extraction."
 msgstr "无法找到源码文件%s来解压缩。"
@@ -1096,37 +1096,37 @@ msgid "Failed to extract %s"
 msgstr "无法解压缩%s"
 
 msgid "Starting build()..."
-msgstr "开始创建……"
+msgstr "开始创建..."
 
 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 "正在删除空目录……"
+msgstr "正在删除空目录..."
 
 msgid "Missing pkg/ directory."
 msgstr "缺少pkg/目录。"
 
 msgid "Creating package..."
-msgstr "正在创建软件包……"
+msgstr "正在创建软件包..."
 
 msgid "Generating .PKGINFO file..."
-msgstr "正在生成.PKGINFO文件……"
+msgstr "正在生成.PKGINFO文件..."
 
 msgid "Please add a license line to your %s!"
 msgstr "请添加软件许可行到你的%s！"
@@ -1135,13 +1135,13 @@ msgid "Example for GPL'ed software: license=('GPL')."
 msgstr "GPL软件的列子：license=('GPL')"
 
 msgid "Adding install script..."
-msgstr "正在添加安装脚本……"
+msgstr "正在添加安装脚本..."
 
 msgid "Adding package changelog..."
-msgstr "正在添加软件包更新日志……"
+msgstr "正在添加软件包更新日志..."
 
 msgid "Compressing package..."
-msgstr "正在压缩软件包……"
+msgstr "正在压缩软件包..."
 
 msgid "Failed to create package file."
 msgstr "无法创建软件包文件。"
@@ -1150,7 +1150,7 @@ msgid "Cannot find the xdelta binary! Is xdelta installed?"
 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签名"
@@ -1168,37 +1168,37 @@ msgid "No previous version found, skipping xdelta."
 msgstr "没有发现先前版本，跳过xdelta。"
 
 msgid "Creating source package..."
-msgstr "正在创建源码包……"
+msgstr "正在创建源码包..."
 
 msgid "Adding %s..."
-msgstr "正在添加%s……"
+msgstr "正在添加%s..."
 
 msgid "Install script %s not found."
 msgstr "安装脚本%s没有找到。"
 
 msgid "Compressing source package..."
-msgstr "正在压缩源码包……"
+msgstr "正在压缩源码包..."
 
 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"
@@ -1384,7 +1384,7 @@ msgid "Install scriptlet (%s) does not exist."
 msgstr "安装小脚本(%s)不存在。"
 
 msgid "A package has already been built, installing existing package..."
-msgstr "已有一个编译好的软件包，正在安装现存的软件包……"
+msgstr "已有一个编译好的软件包，正在安装现存的软件包..."
 
 msgid "A package has already been built. (use -f to overwrite)"
 msgstr "已有一个编译好的软件包。（使用-f覆盖）"
@@ -1399,7 +1399,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"
@@ -1408,10 +1408,10 @@ msgid "Skipping dependency checks."
 msgstr "跳过依赖关系检查。"
 
 msgid "Checking Runtime Dependencies..."
-msgstr "正在检查运行时依赖关系……"
+msgstr "正在检查运行时依赖关系..."
 
 msgid "Checking Buildtime Dependencies..."
-msgstr "正在检查编译时依赖关系……"
+msgstr "正在检查编译时依赖关系..."
 
 msgid "Could not resolve all dependencies."
 msgstr "无法解决所有的依赖关系。"
@@ -1438,10 +1438,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"
@@ -1484,28 +1484,28 @@ 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失败。"
 
 msgid "Making and MD5sum'ing the new db..."
-msgstr "正在生成新数据库及MD5校验值……"
+msgstr "正在生成新数据库及MD5校验值..."
 
 msgid "Untar'ing %s failed."
 msgstr "解包%s失败。"
 
 msgid "Checking integrity..."
-msgstr "正在检查完整性……"
+msgstr "正在检查完整性..."
 
 msgid "Integrity check FAILED, reverting to old database."
 msgstr "完整性检查失败，恢复到原数据库。"
 
 msgid "Putting the new database in place..."
-msgstr "正在把新的数据库放置到位……"
+msgstr "正在把新的数据库放置到位..."
 
 msgid "Finished. Your pacman database has been optimized."
 msgstr "完毕。你的pacman数据库已经优化。"
@@ -1532,7 +1532,7 @@ msgstr ""
 "查，\\n直接更新软件包\\n\\n"
 
 msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
-msgstr "例子：  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
+msgstr "例子:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 
 msgid ""
 "Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nThis is free "
@@ -1540,25 +1540,25 @@ 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'。"
 
 msgid "Removing existing package '%s'..."
-msgstr "正在删除现有的软件包'%s'……"
+msgstr "正在删除现有的软件包'%s'..."
 
 msgid "Creating 'desc' db entry..."
 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'"
@@ -1576,7 +1576,7 @@ msgid "Repository file '%s' is not a proper pacman database."
 msgstr "库文件'%s'不是一个有效的pacman数据库。"
 
 msgid "Extracting database to a temporary location..."
-msgstr "正在解压缩数据库到一个临时目录……"
+msgstr "正在解压缩数据库到一个临时目录..."
 
 msgid "'%s' is not a package file, skipping"
 msgstr "'%s'不是一个软件包文件，跳过"
@@ -1614,13 +1614,13 @@ msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
 msgstr "例子：repo-remove /path/to/repo.db.tar.gz kernel26"
 
 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'……"
+msgstr "正在生成更新的数据库文件 '%s'..."
 
 msgid "All packages have been removed from the database. Deleting '%s'."
 msgstr "所有软件包已经从数据库中删除。正在删除'%s'。"
@@ -1669,7 +1669,7 @@ 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没有找到"