Merge branch 'maint'

Conflicts: src/pacman/callback.c
author: Dan McGee <dan@archlinux.org> 2008-02-24 08:22:07 +0100
committer: Dan McGee <dan@archlinux.org> 2008-02-24 08:22:07 +0100
commit: 3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb (patch)
tree: 6b968cc50ea7395b02c043022da292732196339b
parent: 3a6f62d4c711d2e05821094d02d7aca290cf15f9 (diff)
parent: 96f7613d15e46131bf8a4b93828ad70b041524d1 (diff)
download: pacman-3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb.tar.gz
pacman-3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb.tar.xz
12 files changed, 2896 insertions, 89 deletions
diff --git a/NEWS b/NEWS
index 451cd519..329dffc1 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,13 @@ VERSION         DESCRIPTION
               - mark gensync and updatesync as deprecated
               - fix pacman -Qo behavior on symlinks (FS#9473)
               - fix segfault on a broken symlinks in backup code (FS#9235)
+              - ensure filename is determined correctly for a pkg (FS#9547)
+              - fix conflict progress bar with UTF-8 chars (FS#6437)
               - fix chk_fileconflicts brokenness, ensure it reads entire list
+              - ensure -Sc operation locks DB, only checks DBs (FS#9609)
               - minor documentation and message updates
               - moved some translations to their more generic lang codes
+              - allow scripts to be run without gettext installed
               - makepkg:
                 - check to ensure we have non-URL sources (FS#9208)
                 - ensure we strip binaries in /opt/ dirs (FS#9342)
diff --git a/TRANSLATORS b/TRANSLATORS
index 249665dd..5bdfdfc6 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -40,4 +40,6 @@ Brazilian Portuguese (pt_BR):
 	Leandro Inácio <leandro@archlinux-br.org>
 Russian (ru):
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
+Simplified Chinese (zh_CN):
+	甘露(Lu.Gan) <rhythm.gan@gmail.com>
 
diff --git a/configure.ac b/configure.ac
index e812dcd5..0b7769dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,13 +46,13 @@ AC_PREREQ(2.60)
 #     For code under development: [devel]
 #     For production releases:    []
 
-m4_define([lib_current], [3])
+m4_define([lib_current], [4])
 m4_define([lib_revision], [0])
-m4_define([lib_age], [1])
+m4_define([lib_age], [2])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [1])
+m4_define([pacman_version_micro], [2])
 m4_define([pacman_version_suffix], [])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
diff --git a/lib/libalpm/po/LINGUAS b/lib/libalpm/po/LINGUAS
index 955e1fdb..539ddd24 100644
--- a/lib/libalpm/po/LINGUAS
+++ b/lib/libalpm/po/LINGUAS
@@ -9,3 +9,4 @@ it
 pl
 pt_BR
 ru
+zh_CN
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index ebe9bf03..5d5fd796 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -1,7 +1,7 @@
 # Russian translations for Pacman package manager package.
 # Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package manager package.
-#  <4rayven@gmail.com>, 2007.
+#  <4rayven@gmail.com>, 2007. <serg.partizan@gmail.com> 2008
 #
 msgid ""
 msgstr ""
@@ -380,7 +380,7 @@ msgstr "%s: принудительно обновляю до версии %s\n"
 #: lib/libalpm/package.c:849
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr "%s: установленная версия (%s) новее, чем %s (%s)\n"
+msgstr "%s: установленная версия (%s) новее, чем в %s (%s)\n"
 
 #: lib/libalpm/package.c:1027
 #, c-format
@@ -534,7 +534,7 @@ msgstr "не удалось получить md5 контрольную сумм
 #: lib/libalpm/sync.c:902
 #, c-format
 msgid "file %s was corrupted (bad MD5 checksum)\n"
-msgstr "архив %s поврежден (не сходится MD5 контрольная сумма)\n"
+msgstr "архив %s поврежден (не сходятся контрольные MD5-суммы)\n"
 
 #: lib/libalpm/sync.c:1049
 #, c-format
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
new file mode 100644
index 00000000..aeb17d95
--- /dev/null
+++ b/lib/libalpm/po/zh_CN.po
@@ -0,0 +1,655 @@
+# Chinese/Simplified translation of Pacman package manager package.
+# Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+# 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008.
+# 
+# 
+# 
+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-01-14 23:08-0600\n"
+"PO-Revision-Date: 2008-02-22 20:42+0800\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"
+"Content-Transfer-Encoding: 8bit"
+
+#: lib/libalpm/add.c:86
+#, c-format
+msgid "replacing older version %s-%s by %s in target list\n"
+msgstr "正在替换老版本 %s-%s 通过在目标清单中的%s\n"
+
+#: lib/libalpm/add.c:95
+#, c-format
+msgid "newer version %s-%s is in the target list -- skipping\n"
+msgstr "较新版本 %s-%s 在目标清单中 -- 跳过\n"
+
+#: lib/libalpm/add.c:166
+msgid "conflicting packages were found in the target list\n"
+msgstr "目标清单中发现有冲突的软件包\n"
+
+#: lib/libalpm/add.c:167
+msgid "you cannot install two conflicting packages at the same time\n"
+msgstr "你不能同时安装有冲突的两个软件包\n"
+
+#: lib/libalpm/add.c:170
+msgid "replacing packages with -A and -U is not supported yet\n"
+msgstr "正在使用 -A 替代软件包， -U 目前尚不支持\n"
+
+#: lib/libalpm/add.c:171
+msgid "you can replace packages manually using -Rd and -U\n"
+msgstr "你可以使用 -Rd 及 -U 来手动替代软件包\n"
+
+#: lib/libalpm/add.c:377
+#, c-format
+msgid ""
+"directory permissions differ on %s\n"
+"filesystem: %o  package: %o\n"
+msgstr "目录权限不一致%s\n"
+"文件系统：%o  软件包：%o\n"
+
+#: lib/libalpm/add.c:404
+#, c-format
+msgid "extract: symlink %s does not point to dir\n"
+msgstr "解压缩：链接 %s 没有指向目录\n"
+
+#: lib/libalpm/add.c:411
+#, c-format
+msgid "extract: not overwriting dir with file %s\n"
+msgstr "解压缩：没有用 %s 覆盖目录\n"
+
+#: lib/libalpm/add.c:466 lib/libalpm/add.c:610 lib/libalpm/util.c:428
+#, c-format
+msgid "could not extract %s (%s)\n"
+msgstr "无法解压缩 %s (%s)\n"
+
+#: lib/libalpm/add.c:517
+#, c-format
+msgid "could not rename %s (%s)\n"
+msgstr "无法重命名 %s (%s)\n"
+
+#: lib/libalpm/add.c:524 lib/libalpm/add.c:544 lib/libalpm/trans.c:508
+#, c-format
+msgid "could not copy tempfile to %s (%s)\n"
+msgstr "无法复制临时文件到 %s (%s)\n"
+
+#: lib/libalpm/add.c:529 lib/libalpm/remove.c:238
+#, c-format
+msgid "%s saved as %s\n"
+msgstr "%s 已另存为 %s\n"
+
+#: lib/libalpm/add.c:568
+#, c-format
+msgid "could not install %s as %s: %s\n"
+msgstr "无法安装 %s 作为 %s: %s\n"
+
+#: lib/libalpm/add.c:571
+#, c-format
+msgid "%s installed as %s\n"
+msgstr "%s 已作为 %s 安装\n"
+
+#: lib/libalpm/add.c:588
+#, c-format
+msgid "extracting %s as %s.pacnew\n"
+msgstr "正在解压缩 %s 作为 %s.pacnew\n"
+
+#: lib/libalpm/add.c:723 lib/libalpm/trans.c:526
+msgid "could not get current working directory\n"
+msgstr "无法得到当前的工作目录\n"
+
+#: lib/libalpm/add.c:777
+#, c-format
+msgid "problem occurred while upgrading %s\n"
+msgstr "更新 %s时出现错误\n"
+
+#: lib/libalpm/add.c:782
+#, c-format
+msgid "problem occurred while installing %s\n"
+msgstr "安装 %s时出现错误\n"
+
+#: lib/libalpm/add.c:797
+#, c-format
+msgid "could not update database entry %s-%s\n"
+msgstr "无法更新数据库记录 %s-%s\n"
+
+#: lib/libalpm/add.c:805
+#, c-format
+msgid "could not add entry '%s' in cache\n"
+msgstr "无法在缓存中添加记录 '%s' \n"
+
+#: lib/libalpm/be_files.c:221
+#, c-format
+msgid "invalid name for database entry '%s'\n"
+msgstr "数据库记录'%s'名字无效\n"
+
+#: lib/libalpm/be_files.c:291 lib/libalpm/be_files.c:428
+#: lib/libalpm/be_files.c:451 lib/libalpm/be_files.c:562
+#: lib/libalpm/be_files.c:640 lib/libalpm/be_files.c:668
+#: lib/libalpm/package.c:885
+#, c-format
+msgid "could not open file %s: %s\n"
+msgstr "无法打开文件 %s: %s\n"
+
+#: lib/libalpm/db.c:283
+#, c-format
+msgid "could not remove database entry %s%s\n"
+msgstr "无法删除数据库记录 %s%s\n"
+
+#: lib/libalpm/db.c:551
+msgid "attempt to re-register the 'local' DB\n"
+msgstr "尝试重新登记“本地”数据库\n"
+
+#: lib/libalpm/db.c:560 lib/libalpm/db.c:611
+msgid "database path is undefined\n"
+msgstr "没有指定数据库路径\n"
+
+#: lib/libalpm/deps.c:171
+msgid "dependency cycle detected:\n"
+msgstr "探测到依赖关系循环：\n"
+
+#: lib/libalpm/deps.c:173
+#, c-format
+msgid "%s will be removed after its %s dependency\n"
+msgstr "%s将在它%s的依赖关系之后被删除\n"
+
+#: lib/libalpm/deps.c:175
+#, c-format
+msgid "%s will be installed before its %s dependency\n"
+msgstr "%s将在它%s的依赖关系之前被安装\n"
+
+#: lib/libalpm/deps.c:588
+#, c-format
+msgid "cannot resolve \"%s\", a dependency of \"%s\"\n"
+msgstr "无法解决\"%s\"，\"%s\"的依赖关系\n"
+
+#: lib/libalpm/error.c:41
+msgid "out of memory!"
+msgstr "没有内存可用！"
+
+#: lib/libalpm/error.c:43
+msgid "unexpected system error"
+msgstr "未预计的系统错误"
+
+#: lib/libalpm/error.c:45
+msgid "insufficient privileges"
+msgstr "权限不充分"
+
+#: lib/libalpm/error.c:47
+msgid "could not find or read file"
+msgstr "无法找到或读取文件"
+
+#: lib/libalpm/error.c:49
+msgid "could not find or read directory"
+msgstr "无法找到或读取目录"
+
+#: lib/libalpm/error.c:51
+msgid "wrong or NULL argument passed"
+msgstr "传递了错误的或空的参数"
+
+#: lib/libalpm/error.c:54
+msgid "library not initialized"
+msgstr "无法初始化函数库"
+
+#: lib/libalpm/error.c:56
+msgid "library already initialized"
+msgstr "函数库已初始化"
+
+#: lib/libalpm/error.c:58
+msgid "unable to lock database"
+msgstr "无法锁定数据库"
+
+#: lib/libalpm/error.c:61
+msgid "could not open database"
+msgstr "无法打开数据库"
+
+#: lib/libalpm/error.c:63
+msgid "could not create database"
+msgstr "无法创建数据库"
+
+#: lib/libalpm/error.c:65
+msgid "database not initialized"
+msgstr "数据库无法初始化"
+
+#: lib/libalpm/error.c:67
+msgid "database already registered"
+msgstr "数据库已登记"
+
+#: lib/libalpm/error.c:69
+msgid "could not find database"
+msgstr "无法找到数据库"
+
+#: lib/libalpm/error.c:71
+msgid "could not update database"
+msgstr "无法更新数据库"
+
+#: lib/libalpm/error.c:73
+msgid "could not remove database entry"
+msgstr "无法删除数据库记录"
+
+#: lib/libalpm/error.c:76
+msgid "invalid url for server"
+msgstr "无效的服务器url"
+
+#: lib/libalpm/error.c:83
+msgid "could not set parameter"
+msgstr "无法设置参数"
+
+#: lib/libalpm/error.c:86
+msgid "transaction already initialized"
+msgstr "处理已初始化"
+
+#: lib/libalpm/error.c:88 lib/libalpm/error.c:92
+msgid "transaction not initialized"
+msgstr "处理无法初始化"
+
+#: lib/libalpm/error.c:90
+msgid "duplicate target"
+msgstr "重复的目标"
+
+#: lib/libalpm/error.c:94
+msgid "transaction not prepared"
+msgstr "处理未准备好"
+
+#: lib/libalpm/error.c:96
+msgid "transaction aborted"
+msgstr "处理已放弃"
+
+#: lib/libalpm/error.c:98
+msgid "operation not compatible with the transaction type"
+msgstr "操作与处理类型不兼容"
+
+#: lib/libalpm/error.c:100
+msgid "could not commit transaction"
+msgstr "无法交付处理"
+
+#: lib/libalpm/error.c:102
+msgid "could not download all files"
+msgstr "无法下载全部文件"
+
+#: lib/libalpm/error.c:105
+msgid "could not find or read package"
+msgstr "无法找到或读取软件包"
+
+#: lib/libalpm/error.c:107
+msgid "invalid or corrupted package"
+msgstr "无效的或已损坏的软件包"
+
+#: lib/libalpm/error.c:109
+msgid "cannot open package file"
+msgstr "无法打开软件包文件"
+
+#: lib/libalpm/error.c:111
+msgid "cannot load package data"
+msgstr "无法加载软件包数据"
+
+#: lib/libalpm/error.c:113
+msgid "package already installed"
+msgstr "软件包已经安装"
+
+#: lib/libalpm/error.c:115
+msgid "package not installed or lesser version"
+msgstr "软件包没有安装或版本较低"
+
+#: lib/libalpm/error.c:117
+msgid "cannot remove all files for package"
+msgstr "无法删除软件包全部文件"
+
+#: lib/libalpm/error.c:119
+msgid "package name is not valid"
+msgstr "软件包名字无效"
+
+#: lib/libalpm/error.c:121
+msgid "corrupted package"
+msgstr "已损坏的软件包"
+
+#: lib/libalpm/error.c:123
+msgid "no such repository"
+msgstr "没有该软件库"
+
+#: lib/libalpm/error.c:126
+msgid "corrupted delta"
+msgstr "已损怀的delta"
+
+#: lib/libalpm/error.c:128
+msgid "delta patch failed"
+msgstr "delta补丁失败"
+
+#: lib/libalpm/error.c:131
+msgid "group not found"
+msgstr "没有找到软件包组"
+
+#: lib/libalpm/error.c:134
+msgid "could not satisfy dependencies"
+msgstr "无法满足依赖关系"
+
+#: lib/libalpm/error.c:136
+msgid "conflicting dependencies"
+msgstr "有冲突的依赖关系"
+
+#: lib/libalpm/error.c:138
+msgid "conflicting files"
+msgstr "有冲突的文件"
+
+#: lib/libalpm/error.c:141
+msgid "user aborted the operation"
+msgstr "用户中断操作"
+
+#: lib/libalpm/error.c:143
+msgid "internal error"
+msgstr "内部错误"
+
+#: lib/libalpm/error.c:145
+msgid "libarchive error"
+msgstr "libarchive错误"
+
+#: lib/libalpm/error.c:148
+msgid "not confirmed"
+msgstr "不能确认"
+
+#: lib/libalpm/error.c:150
+msgid "invalid regular expression"
+msgstr "无效的常规表达式"
+
+#: lib/libalpm/error.c:153
+msgid "connection to remote host failed"
+msgstr "连接远端主机失败"
+
+#: lib/libalpm/error.c:156
+msgid "unexpected error"
+msgstr "未预期的错误"
+
+#: lib/libalpm/package.c:122
+#, c-format
+msgid "could not get md5sum for package %s-%s\n"
+msgstr "无法得到软件包%s-%s的md5值\n"
+
+#: lib/libalpm/package.c:131
+#, c-format
+msgid "md5sums do not match for package %s-%s\n"
+msgstr "软件包%s-%s的md5值不一致\n"
+
+#: lib/libalpm/package.c:844
+#, c-format
+msgid "%s: forcing upgrade to version %s\n"
+msgstr "%s：强制更新至版本%s\n"
+
+#: lib/libalpm/package.c:849
+#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr "%s：本地（%s）比%s版本更新(%s)\n"
+
+#: lib/libalpm/package.c:1027
+#, c-format
+msgid "error extracting package description file to %s\n"
+msgstr "解压缩软件包描述文件到%s时发生错误\n"
+
+#: lib/libalpm/package.c:1033
+#, c-format
+msgid "could not parse package description file in %s\n"
+msgstr "无法分析%s中的软件包描述文件\n"
+
+#: lib/libalpm/package.c:1038
+#, c-format
+msgid "missing package name in %s\n"
+msgstr "%s中缺少软件包名字\n"
+
+#: lib/libalpm/package.c:1042
+#, c-format
+msgid "missing package version in %s\n"
+msgstr "%s中缺少软件包版本号\n"
+
+#: lib/libalpm/package.c:1061 lib/libalpm/package.c:1074
+#, c-format
+msgid "error while reading package %s: %s\n"
+msgstr "读取软件包%s: %s发生错误\n"
+
+#: lib/libalpm/package.c:1081
+#, c-format
+msgid "missing package metadata in %s\n"
+msgstr "%s中缺少软件包元数据\n"
+
+#: lib/libalpm/remove.c:119
+#, c-format
+msgid "could not find %s in database -- skipping\n"
+msgstr "无法在数据库中找到%s -- 跳过\n"
+
+#: lib/libalpm/remove.c:172 lib/libalpm/remove.c:247
+#, c-format
+msgid "cannot remove file '%s': %s\n"
+msgstr "无法删除文件'%s': %s\n"
+
+#: lib/libalpm/remove.c:341
+#, c-format
+msgid "could not remove database entry %s-%s\n"
+msgstr "无法删除数据库记录%s-%s\n"
+
+#: lib/libalpm/remove.c:346
+#, c-format
+msgid "could not remove entry '%s' from cache\n"
+msgstr "无法从缓存中删除记录'%s'\n"
+
+#: lib/libalpm/server.c:54
+#, c-format
+msgid "url '%s' is invalid, ignoring\n"
+msgstr "url %s' 无效，忽略\n"
+
+#: lib/libalpm/server.c:58
+msgid "url scheme not specified, assuming http\n"
+msgstr "url scheme没有指定，假定为http\n"
+
+#: lib/libalpm/server.c:239
+msgid "disk"
+msgstr "硬盘"
+
+#: lib/libalpm/server.c:243
+#, c-format
+msgid "failed retrieving file '%s' from %s : %s\n"
+msgstr "获取文件'%s'从%s : %s失败\n"
+
+#: lib/libalpm/server.c:273
+msgid "cannot resume download, starting over\n"
+msgstr "无法恢复下载，重新开始\n"
+
+#: lib/libalpm/server.c:286
+#, c-format
+msgid "cannot write to file '%s'\n"
+msgstr "无法写入文件'%s'\n"
+
+#: lib/libalpm/server.c:305
+#, c-format
+msgid "error downloading '%s': %s\n"
+msgstr "下载'%s': %s时出错\n"
+
+#: lib/libalpm/server.c:317
+#, c-format
+msgid "error writing to file '%s': %s\n"
+msgstr "写入文件'%s': %s时出错\n"
+
+#: lib/libalpm/server.c:385
+#, c-format
+msgid "could not chdir to %s\n"
+msgstr "无法改变目录到%s\n"
+
+#: lib/libalpm/server.c:392
+msgid "running XferCommand: fork failed!\n"
+msgstr "运行XferCommand:分支失败！\n"
+
+#: lib/libalpm/server.c:443
+msgid "URL does not contain a file for download\n"
+msgstr "URL没有包含可下载的文件\n"
+
+#: lib/libalpm/server.c:456
+#, c-format
+msgid "failed to download %s\n"
+msgstr "下载%s失败\n"
+
+#: lib/libalpm/sync.c:133
+#, c-format
+msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
+msgstr "%s-%s：忽略软件包更新（由%s-%s替代）\n"
+
+#: lib/libalpm/sync.c:248
+#, c-format
+msgid "%s-%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s-%s：忽略软件包更新（%s => %s）\n"
+
+#: lib/libalpm/sync.c:309
+#, c-format
+msgid "repository '%s' not found\n"
+msgstr "没有找到软件库'%s'\n"
+
+#: lib/libalpm/sync.c:336
+#, c-format
+msgid "%s-%s is up to date -- skipping\n"
+msgstr "%s-%s已经为最新 -- 跳过\n"
+
+#: lib/libalpm/sync.c:340
+#, c-format
+msgid "%s-%s is up to date -- reinstalling\n"
+msgstr "%s-%s已经为最新 -- 重新安装\n"
+
+#: lib/libalpm/sync.c:596 lib/libalpm/sync.c:601
+msgid "unresolvable package conflicts detected\n"
+msgstr "探测到无法解决的软件包冲突\n"
+
+#: lib/libalpm/sync.c:611
+#, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "内存分配错误：无法分配 %zd bytes\n"
+
+#: lib/libalpm/sync.c:812
+#, c-format
+msgid "command: %s\n"
+msgstr "命令：%s\n"
+
+#: lib/libalpm/sync.c:876 lib/libalpm/sync.c:886
+#, c-format
+msgid "can't get md5 checksum for file %s\n"
+msgstr "无法得到文件%s的md5检查值\n"
+
+#: lib/libalpm/sync.c:902
+#, c-format
+msgid "file %s was corrupted (bad MD5 checksum)\n"
+msgstr "文件%s已损坏（坏的MD5检查值）\n"
+
+#: lib/libalpm/sync.c:1049
+#, c-format
+msgid "failed to retrieve some files from %s\n"
+msgstr "某些文件无法从%s取回\n"
+
+#: lib/libalpm/sync.c:1130
+msgid "could not create removal transaction\n"
+msgstr "无法生成可删除处理\n"
+
+#: lib/libalpm/sync.c:1136
+msgid "could not initialize the removal transaction\n"
+msgstr "无法初始化可删除处理\n"
+
+#: lib/libalpm/sync.c:1158
+msgid "could not prepare removal transaction\n"
+msgstr "无法准备可删除处理\n"
+
+#: lib/libalpm/sync.c:1164
+msgid "could not commit removal transaction\n"
+msgstr "无法交付可删除处理\n"
+
+#: lib/libalpm/sync.c:1175
+msgid "could not create transaction\n"
+msgstr "无法创建处理\n"
+
+#: lib/libalpm/sync.c:1180
+msgid "could not initialize transaction\n"
+msgstr "无法初始化处理\n"
+
+#: lib/libalpm/sync.c:1207
+msgid "could not prepare transaction\n"
+msgstr "无法准备处理\n"
+
+#: lib/libalpm/sync.c:1212
+msgid "could not commit transaction\n"
+msgstr "无法交付处理\n"
+
+#: lib/libalpm/trans.c:212
+#, c-format
+msgid "could not remove lock file %s\n"
+msgstr "无法删除锁定文件%s\n"
+
+#: lib/libalpm/trans.c:483
+msgid "No /bin/sh in parent environment, aborting scriptlet\n"
+msgstr "父环境中没有/bin/sh，正在中断脚本\n"
+
+#: lib/libalpm/trans.c:494
+msgid "could not create temp directory\n"
+msgstr "无法创建临时目录\n"
+
+#: lib/libalpm/trans.c:533
+#, c-format
+msgid "could not change directory to %s (%s)\n"
+msgstr "无法更改目录到%s (%s)\n"
+
+#: lib/libalpm/trans.c:551
+#, c-format
+msgid "could not fork a new process (%s)\n"
+msgstr "无法分支新进程(%s)\n"
+
+#: lib/libalpm/trans.c:561
+#, c-format
+msgid "could not change the root directory (%s)\n"
+msgstr "无法更改根目录(%s)\n"
+
+#: lib/libalpm/trans.c:566
+#, c-format
+msgid "could not change directory to / (%s)\n"
+msgstr "无法更改目录到/ (%s)\n"
+
+#: lib/libalpm/trans.c:575
+#, c-format
+msgid "call to popen failed (%s)"
+msgstr "调用popen失败(%s)"
+
+#: lib/libalpm/trans.c:594
+#, c-format
+msgid "call to waitpid failed (%s)\n"
+msgstr "调用waitpid失败(%s)\n"
+
+#: lib/libalpm/trans.c:603
+msgid "scriptlet failed to execute correctly\n"
+msgstr "脚本没有被正确执行\n"
+
+#: lib/libalpm/trans.c:612
+#, c-format
+msgid "could not remove tmpdir %s\n"
+msgstr "无法删除临时目录%s\n"
+
+#: lib/libalpm/util.c:207
+#, c-format
+msgid "failed to make path '%s' : %s\n"
+msgstr "无法创建路径'%s' : %s\n"
+
+#: lib/libalpm/util.c:392
+#, c-format
+msgid "could not open %s: %s\n"
+msgstr "无法打开%s: %s\n"
+
+#: lib/libalpm/util.c:579
+#, c-format
+msgid "no %s cache exists, creating...\n"
+msgstr "没有%s缓存存在，正在创建……\n"
+
+#: lib/libalpm/util.c:595
+msgid "couldn't create package cache, using /tmp instead\n"
+msgstr "无法创建软件包缓存，正在使用/tmp代替\n"
+
+#: lib/libalpm/util.c:644
+#, c-format
+msgid "md5: %s can't be opened\n"
+msgstr "md5：%s无法打开\n"
+
+#: lib/libalpm/util.c:646
+#, c-format
+msgid "md5: %s can't be read\n"
+msgstr "md5：%s无法读取\n"
+
diff --git a/po/LINGUAS b/po/LINGUAS
index 955e1fdb..539ddd24 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -9,3 +9,4 @@ it
 pl
 pt_BR
 ru
+zh_CN
diff --git a/po/ru.po b/po/ru.po
index c6943a43..15cca948 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2007 Judd Vinet <jvinet@zeroflux.org>
 # This file is distributed under the same license as the Pacman package.
 # Vladimir Bayrakovskiy <4rayven@gmail.com>, Vitaly Dolgov <ferhiord@gmail.com>, 2007
-#
+# Sergey Tereschenko <serg.partizan@gmail.com> 2008
 msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2008-02-09 10:41-0600\n"
 "PO-Revision-Date: 2007-03-07 11:45-0500\n"
-"Last-Translator: Vitaly Dolgov <ferhiord@gmail.com>\n"
+"Last-Translator: Sergey Tereschenko <serg.partizan@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
 msgstr ""
-"  если Вы уверены, что pacman еще не запущен, можете\n"
+"  если Вы уверены, что pacman уже не запущен, можете\n"
 "  удалить %s\n"
 
 #: src/pacman/add.c:114 src/pacman/remove.c:106
@@ -293,7 +293,7 @@ msgstr "Заменяет                 :"
 #: src/pacman/package.c:111
 #, c-format
 msgid "Download Size  : %6.2f K\n"
-msgstr "Будет загружено         : %6.2f K\n"
+msgstr "Будет загружено          : %6.2f K\n"
 
 #: src/pacman/package.c:115
 #, c-format
@@ -303,31 +303,31 @@ msgstr "Размер архива           : %6.2f K\n"
 #: src/pacman/package.c:119
 #, c-format
 msgid "Installed Size : %6.2f K\n"
-msgstr "Размер установленного   : %6.2f K\n"
+msgstr "Размер установленного    : %6.2f K\n"
 
 #: src/pacman/package.c:121
 msgid "Packager       :"
-msgstr "Сборщик                 :"
+msgstr "Сборщик                  :"
 
 #: src/pacman/package.c:122
 msgid "Architecture   :"
-msgstr "Архитектура             :"
+msgstr "Архитектура              :"
 
 #: src/pacman/package.c:123
 msgid "Build Date     :"
-msgstr "Дата сборки             :"
+msgstr "Дата сборки              :"
 
 #: src/pacman/package.c:125
 msgid "Install Date   :"
-msgstr "Дата установки          :"
+msgstr "Дата установки           :"
 
 #: src/pacman/package.c:126
 msgid "Install Reason :"
-msgstr "Причина установки       :"
+msgstr "Причина установки        :"
 
 #: src/pacman/package.c:129
 msgid "Install Script :"
-msgstr "Установочный скрипт     :"
+msgstr "Установочный скрипт      :"
 
 #: src/pacman/package.c:130
 msgid "Yes"
@@ -339,11 +339,11 @@ msgstr "No"
 
 #: src/pacman/package.c:135
 msgid "MD5 Sum        :"
-msgstr "MD5-сумма               :"
+msgstr "MD5-сумма                :"
 
 #: src/pacman/package.c:159
 msgid "Repository     :"
-msgstr "Репозиторий             :"
+msgstr "Репозиторий              :"
 
 #: src/pacman/package.c:169
 #, c-format
@@ -1280,7 +1280,7 @@ msgstr "Недостающие зависимости:"
 
 #: scripts/makepkg.sh.in:444
 msgid "Retrieving Sources..."
-msgstr "Получаю исходные коды..."
+msgstr "Получаю исходные файлы..."
 
 #: scripts/makepkg.sh.in:447
 msgid "You do not have write permission to store downloads in %s."
@@ -1288,7 +1288,7 @@ msgstr "У вас нет прав на запись, чтобы сохранит
 
 #: scripts/makepkg.sh.in:458
 msgid "Found %s in build dir"
-msgstr "Обнаружен %s в директории для сборки"
+msgstr "Обнаружен %s в директории сборки"
 
 #: scripts/makepkg.sh.in:462
 msgid "Using cached copy of %s"
@@ -1296,7 +1296,7 @@ msgstr "Использую копию %s из кэша"
 
 #: scripts/makepkg.sh.in:469
 msgid "%s was not found in the build directory and is not a URL."
-msgstr "%s не найден в директории для сборки и это не URL."
+msgstr "%s не найден в директории сборки и это не URL."
 
 #: scripts/makepkg.sh.in:476
 msgid "Downloading %s..."
@@ -1308,7 +1308,7 @@ msgstr "Загрузка %s завершилась неудачей"
 
 #: scripts/makepkg.sh.in:492
 msgid "Generating checksums for source files..."
-msgstr "Генерирую контрольные суммы для файлов с исходными кодами..."
+msgstr "Генерирую контрольные суммы исходных файлов..."
 
 #: scripts/makepkg.sh.in:501
 msgid "Invalid integrity algorithm '%s' specified."
@@ -1328,7 +1328,7 @@ msgstr "Указан неверный алгоритм '%s'"
 
 #: scripts/makepkg.sh.in:564
 msgid "Validating source files with %s..."
-msgstr "Проверка файлов с исходными кодами с посощью %s..."
+msgstr "Проверка исходных файлов с помощью %s..."
 
 #: scripts/makepkg.sh.in:574
 msgid "NOT FOUND"
@@ -1340,7 +1340,7 @@ msgstr "Завершено"
 
 #: scripts/makepkg.sh.in:585
 msgid "FAILED"
-msgstr "НЕ УДАЛОСЬ"
+msgstr "СБОЙ"
 
 #: scripts/makepkg.sh.in:593
 msgid "One or more files did not pass the validity check!"
@@ -1352,7 +1352,7 @@ msgstr "Проверка целостности (%s) не выполнена и�
 
 #: scripts/makepkg.sh.in:603
 msgid "Extracting Sources..."
-msgstr "Распаковка исходных кодов..."
+msgstr "Распаковка исходных файлов..."
 
 #: scripts/makepkg.sh.in:615
 msgid "Unable to find source file %s for extraction."
@@ -1416,7 +1416,7 @@ msgstr "Пример для программ под лицензией GPL: lice
 
 #: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
 msgid "Adding install script..."
-msgstr "Добавляю инсталяционный скрипт..."
+msgstr "Добавляю установочный скрипт..."
 
 #: scripts/makepkg.sh.in:862
 msgid "Adding package changelog..."
@@ -1424,7 +1424,7 @@ msgstr "Добавляю список изменений пакета... "
 
 #: scripts/makepkg.sh.in:868
 msgid "Compressing package..."
-msgstr "Архивирую пакета... "
+msgstr "Архивирую пакет... "
 
 #: scripts/makepkg.sh.in:873
 msgid "Failed to create package file."
@@ -1482,31 +1482,31 @@ msgstr "Не удалось создать пакет с исходными ко
 
 #: scripts/makepkg.sh.in:1005
 msgid "Determining latest darcs revision..."
-msgstr "Определяю последнюю darcs ревизию..."
+msgstr "Определяю последнюю версию в darcs..."
 
 #: scripts/makepkg.sh.in:1009
 msgid "Determining latest cvs revision..."
-msgstr "Определяю последнюю cvs ревизию..."
+msgstr "Определяю последнюю версию в cvs..."
 
 #: scripts/makepkg.sh.in:1013
 msgid "Determining latest git revision..."
-msgstr "Определяю последнюю git ревизию..."
+msgstr "Определяю последнюю версию в git..."
 
 #: scripts/makepkg.sh.in:1017
 msgid "Determining latest svn revision..."
-msgstr "Определяю последнюю svn ревизию..."
+msgstr "Определяю последнюю версию в svn..."
 
 #: scripts/makepkg.sh.in:1021
 msgid "Determining latest bzr revision..."
-msgstr "Определяю последнюю bzr ревизию..."
+msgstr "Определяю последнюю версию в bzr..."
 
 #: scripts/makepkg.sh.in:1025
 msgid "Determining latest hg revision..."
-msgstr "Определяю последнюю hg ревизию..."
+msgstr "Определяю последнюю версию в hg..."
 
 #: scripts/makepkg.sh.in:1040
 msgid "Version found: %s"
-msgstr "Обнаруженная версия: %s"
+msgstr "Обнаружена версия: %s"
 
 #: scripts/makepkg.sh.in:1071
 msgid "Usage: %s [options]"
@@ -1522,8 +1522,7 @@ msgstr "  -А --ignorearch Игнорировать неполное поле ar
 
 #: scripts/makepkg.sh.in:1075
 msgid "  -b, --builddeps  Build missing dependencies from source"
-msgstr ""
-"  -b, --builddeps  Собирать недостающие зависимости из исходных текстов"
+msgstr "  -b, --builddeps  Собирать недостающие зависимости из исходных файлов"
 
 #: scripts/makepkg.sh.in:1076
 msgid "  -c, --clean      Clean up work files after build"
@@ -1531,7 +1530,7 @@ msgstr "  -c, --clean      Удалять оставшиеся после сбо
 
 #: scripts/makepkg.sh.in:1077
 msgid "  -C, --cleancache Clean up source files from the cache"
-msgstr "  -C, --cleancache Очистить кэш от исходных текстов"
+msgstr "  -C, --cleancache Очистить кэш от исходных файлов"
 
 #: scripts/makepkg.sh.in:1078
 msgid "  -d, --nodeps     Skip all dependency checks"
@@ -1540,8 +1539,8 @@ msgstr "  -d, --nodeps     Не проверять зависимости"
 #: scripts/makepkg.sh.in:1079
 msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
 msgstr ""
-"  -e, --noextract  Не извлекать файлы с исходными кодами (использовать "
-"существующие в src/)"
+"  -e, --noextract  Не извлекать исходные файлы (использовать существующие в "
+"src/)"
 
 #: scripts/makepkg.sh.in:1080
 msgid "  -f, --force      Overwrite existing package"
@@ -1551,7 +1550,7 @@ msgstr "  -f, --force      Переписать существующий пак�
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr ""
 "  -g, --geninteg   Генерировать информацию для проверки целостности исходных "
-"текстов"
+"файлов"
 
 #: scripts/makepkg.sh.in:1082
 msgid "  -h, --help       This help"
@@ -1844,7 +1843,7 @@ msgstr "Директория пакета пуста. Здесь нечего п
 
 #: scripts/makepkg.sh.in:1451
 msgid "Sources are ready."
-msgstr "Исходные коды готовы."
+msgstr "Исходные файлы готовы."
 
 #: scripts/makepkg.sh.in:1456
 msgid "Removing existing pkg/ directory..."
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 00000000..95d7cf38
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,2062 @@
+# Chinese/Simplified translation for Pacman package manager package.
+# Copyright (C) 2008 Judd Vinet <jvinet@zeroflux.org>
+# This file is distributed under the same license as the Pacman package manager package.
+# 甘露(Lu.Gan) <rhythm.gan@gmail.com>, 2008.
+# 
+# 
+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-02-09 10:41-0600\n"
+"PO-Revision-Date: 2008-02-22 20:51+0800\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"
+"Content-Transfer-Encoding: 8bit"
+
+#: src/pacman/add.c:40 src/pacman/remove.c:42
+#, c-format
+msgid "failed to release transaction (%s)\n"
+msgstr "无法释放事务处理(%s)\n"
+
+#: src/pacman/add.c:77 src/pacman/query.c:370 src/pacman/remove.c:63
+#: src/pacman/sync.c:781
+msgid "no targets specified (use -h for help)\n"
+msgstr "没有指定目标（使用 -h 获取帮助）\n"
+
+#: src/pacman/add.c:104 src/pacman/sync.c:510
+#, c-format
+msgid "error: %s\n"
+msgstr "错误： %s\n"
+
+#: src/pacman/add.c:107 src/pacman/remove.c:98 src/pacman/sync.c:484
+#, c-format
+msgid ""
+"  if you're sure a package manager is not already\n"
+"  running, you can remove %s.\n"
+msgstr "  如果你确认软件包管理器已经没有\n"
+"  运行，你可以删除 %s。\n"
+
+#: src/pacman/add.c:114 src/pacman/remove.c:106
+#, c-format
+msgid "loading package data... "
+msgstr "正在装载软件包数据……"
+
+#: src/pacman/add.c:119 src/pacman/remove.c:111 src/pacman/sync.c:570
+#, c-format
+msgid "error: '%s': %s\n"
+msgstr "错误：'%s'： %s\n"
+
+#: src/pacman/add.c:125 src/pacman/remove.c:118 src/pacman/sync.c:176
+#: src/pacman/sync.c:194
+#, c-format
+msgid "done.\n"
+msgstr "完毕。\n"
+
+#: src/pacman/add.c:130 src/pacman/remove.c:122 src/pacman/sync.c:643
+#, c-format
+msgid "error: failed to prepare transaction (%s)\n"
+msgstr "错误：无法准备(%s)\n"
+
+#: src/pacman/add.c:142 src/pacman/remove.c:130 src/pacman/sync.c:652
+#, c-format
+msgid ":: %s: requires %s\n"
+msgstr ":: %s: 要求 %s\n"
+
+#: src/pacman/add.c:150 src/pacman/sync.c:660
+#, c-format
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: 与 %s冲突\n"
+
+#: src/pacman/add.c:159 src/pacman/sync.c:715
+#, c-format
+msgid "%s exists in both '%s' and '%s'\n"
+msgstr "%s 存在于 '%s' 和 '%s'\n"
+
+#: src/pacman/add.c:165 src/pacman/sync.c:721
+#, c-format
+msgid "%s: %s exists in filesystem\n"
+msgstr "%s: 文件系统中已存在 %s \n"
+
+#: src/pacman/add.c:171
+#, c-format
+msgid ""
+"\n"
+"errors occurred, no packages were upgraded.\n"
+msgstr "\n"
+"发生错误，没有软件包进行更新\n"
+
+#: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
+#, c-format
+msgid "error: failed to commit transaction (%s)\n"
+msgstr "错误：无法交付处理(%s)\n"
+
+#: src/pacman/callback.c:165
+#, c-format
+msgid "checking dependencies...\n"
+msgstr "正在检查倚赖关系……\n"
+
+#: src/pacman/callback.c:169
+#, c-format
+msgid "checking for file conflicts...\n"
+msgstr "正在检查文件冲突……\n"
+
+#: src/pacman/callback.c:173
+#, c-format
+msgid "resolving dependencies...\n"
+msgstr "正在解决倚赖关系……\n"
+
+#: src/pacman/callback.c:176
+#, c-format
+msgid "looking for inter-conflicts...\n"
+msgstr "正在查找内部冲突……\n"
+
+#: src/pacman/callback.c:180
+#, c-format
+msgid "installing %s...\n"
+msgstr "正在安装 %s……\n"
+
+#: src/pacman/callback.c:191
+#, c-format
+msgid "removing %s...\n"
+msgstr "正在删除 %s……\n"
+
+#: src/pacman/callback.c:202
+#, c-format
+msgid "upgrading %s...\n"
+msgstr "正在升级 %s……\n"
+
+#: src/pacman/callback.c:213
+#, c-format
+msgid "checking package integrity...\n"
+msgstr "正在检查软件包完整性……\n"
+
+#: src/pacman/callback.c:216
+#, c-format
+msgid "checking delta integrity...\n"
+msgstr "正在检查delta完整性……\n"
+
+#: src/pacman/callback.c:219
+#, c-format
+msgid "applying deltas...\n"
+msgstr "正在应用deltas……\n"
+
+#: src/pacman/callback.c:222
+#, c-format
+msgid "generating %s with %s... "
+msgstr "正在使用 %s 生成%s……"
+
+#: src/pacman/callback.c:225
+#, c-format
+msgid "success!\n"
+msgstr "成功完成！\n"
+
+#: src/pacman/callback.c:228
+#, c-format
+msgid "failed.\n"
+msgstr "失败。\n"
+
+#: src/pacman/callback.c:237
+#, c-format
+msgid ":: Retrieving packages from %s...\n"
+msgstr ":: 正在从 %s获取软件包……\n"
+
+#: src/pacman/callback.c:265
+#, c-format
+msgid ""
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
+"n] "
+msgstr ":: %s需要安装列在IgnorePkg/IgnoreGroup（忽略清单）中的%s。无论如何都进行安装吗?[Y/n]"
+
+#: src/pacman/callback.c:270
+#, c-format
+msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
+msgstr ":: %s列在IgnorePkg/IgnoreGroup中。无论如何都进行安装吗?[Y/n]"
+
+#: src/pacman/callback.c:276
+#, c-format
+msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
+msgstr ":: %s是作为HoldPkg指定的。无论如何都删除吗？[Y/n]"
+
+#: src/pacman/callback.c:282
+#, c-format
+msgid ":: Replace %s with %s/%s? [Y/n] "
+msgstr ":: 用 %s/%s 替代 %s？[Y/n]"
+
+#: src/pacman/callback.c:288
+#, c-format
+msgid "Replacing %s with %s/%s\n"
+msgstr "正在用 %s/%s 替代 %s\n"
+
+#: src/pacman/callback.c:296
+#, c-format
+msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
+msgstr ":: %s 与 %s 有冲突。删除 %s？[Y/n]"
+
+#: src/pacman/callback.c:304
+#, c-format
+msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
+msgstr ":: %s-%s：本地版本较新。无论如何都升级吗？[Y/n]"
+
+#: src/pacman/callback.c:314
+#, c-format
+msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
+msgstr ":: 文件 %s 已经损坏。你想要删除它吗？[Y/n]"
+
+#: src/pacman/callback.c:364
+msgid "installing"
+msgstr "正在安装"
+
+#: src/pacman/callback.c:367
+msgid "upgrading"
+msgstr "生在升级"
+
+#: src/pacman/callback.c:370
+msgid "removing"
+msgstr "正在删除"
+
+#: src/pacman/callback.c:373
+msgid "checking for file conflicts"
+msgstr "正在检查文件冲突"
+
+#: src/pacman/package.c:68
+msgid "Explicitly installed"
+msgstr "已指定安装"
+
+#: src/pacman/package.c:71
+msgid "Installed as a dependency for another package"
+msgstr "已经作为其他软件包的倚赖关系安装"
+
+#: src/pacman/package.c:74
+msgid "Unknown"
+msgstr "未知的"
+
+#: src/pacman/package.c:89
+msgid "Description    : "
+msgstr "描述："
+
+#: src/pacman/package.c:93
+msgid "Filename       :"
+msgstr "文件名："
+
+#: src/pacman/package.c:95
+msgid "Name           :"
+msgstr "名称："
+
+#: src/pacman/package.c:96
+msgid "Version        :"
+msgstr "版本："
+
+#: src/pacman/package.c:97
+msgid "URL            :"
+msgstr "URL："
+
+#: src/pacman/package.c:98
+msgid "Licenses       :"
+msgstr "版权声明："
+
+#: src/pacman/package.c:99
+msgid "Groups         :"
+msgstr "软件组："
+
+#: src/pacman/package.c:100
+msgid "Provides       :"
+msgstr "提供:"
+
+#: src/pacman/package.c:101
+msgid "Depends On     :"
+msgstr "倚赖于："
+
+#: src/pacman/package.c:102
+msgid "Optional Deps  :"
+msgstr "可选倚赖："
+
+#: src/pacman/package.c:105
+msgid "Required By    :"
+msgstr "要求被："
+
+#: src/pacman/package.c:108
+msgid "Conflicts With :"
+msgstr "冲突与："
+
+#: src/pacman/package.c:109
+msgid "Replaces       :"
+msgstr "取代："
+
+#: src/pacman/package.c:111
+#, c-format
+msgid "Download Size  : %6.2f K\n"
+msgstr "需下载大小：%6.2f K\n"
+
+#: src/pacman/package.c:115
+#, c-format
+msgid "Compressed Size: %6.2f K\n"
+msgstr "压缩后大小：%6.2f K\n"
+
+#: src/pacman/package.c:119
+#, c-format
+msgid "Installed Size : %6.2f K\n"
+msgstr "安装后大小：%6.2f K\n"
+
+#: src/pacman/package.c:121
+msgid "Packager       :"
+msgstr "打包者："
+
+#: src/pacman/package.c:122
+msgid "Architecture   :"
+msgstr "架构："
+
+#: src/pacman/package.c:123
+msgid "Build Date     :"
+msgstr "编译日期："
+
+#: src/pacman/package.c:125
+msgid "Install Date   :"
+msgstr "安装日期："
+
+#: src/pacman/package.c:126
+msgid "Install Reason :"
+msgstr "安装原因："
+
+#: src/pacman/package.c:129
+msgid "Install Script :"
+msgstr "安装脚本："
+
+#: src/pacman/package.c:130
+msgid "Yes"
+msgstr "是"
+
+#: src/pacman/package.c:130
+msgid "No"
+msgstr "否"
+
+#: src/pacman/package.c:135
+msgid "MD5 Sum        :"
+msgstr "MD5值："
+
+#: src/pacman/package.c:159
+msgid "Repository     :"
+msgstr "软件库："
+
+#: src/pacman/package.c:169
+#, c-format
+msgid "Backup Files:\n"
+msgstr "备份文件：\n"
+
+#: src/pacman/package.c:189
+#, c-format
+msgid "error: could not calculate checksums for %s\n"
+msgstr "错误：无法计算 %s 的完整性检查值\n"
+
+#: src/pacman/package.c:197
+#, c-format
+msgid "MODIFIED\t%s\n"
+msgstr "修改\t%s\n"
+
+#: src/pacman/package.c:199
+#, c-format
+msgid "Not Modified\t%s\n"
+msgstr "没有修改过\t%s\n"
+
+#: src/pacman/package.c:203
+#, c-format
+msgid "MISSING\t\t%s\n"
+msgstr "缺少\t\t%s\n"
+
+#: src/pacman/package.c:209
+#, c-format
+msgid "(none)\n"
+msgstr "（无）\n"
+
+#: src/pacman/package.c:243
+#, c-format
+msgid "error: no changelog available for '%s'.\n"
+msgstr "错误： '%s'没有可获得的更新日志。\n"
+
+#: src/pacman/pacman.c:60
+msgid "options"
+msgstr "选项"
+
+#: src/pacman/pacman.c:61
+msgid "file"
+msgstr "文件"
+
+#: src/pacman/pacman.c:62
+msgid "package"
+msgstr "软件包"
+
+#: src/pacman/pacman.c:63
+msgid "usage"
+msgstr "用法"
+
+#: src/pacman/pacman.c:64
+msgid "operation"
+msgstr "操作"
+
+#: src/pacman/pacman.c:76
+#, c-format
+msgid ""
+"\n"
+"use '%s --help' with other options for more syntax\n"
+msgstr ""
+"\n"
+"使用 '%s --help' 以及其他选项查看更多语法\n"
+
+#: src/pacman/pacman.c:81 src/pacman/pacman.c:95 src/pacman/pacman.c:117
+#, c-format
+msgid "      --asdeps         install packages as non-explicitly installed\n"
+msgstr "      --asdeps         作为非指定安装的软件包安装\n"
+
+#: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
+#: src/pacman/pacman.c:119
+#, c-format
+msgid "  -d, --nodeps         skip dependency checks\n"
+msgstr "  -d, --nodeps         略过倚赖关系检查\n"
+
+#: src/pacman/pacman.c:83 src/pacman/pacman.c:97 src/pacman/pacman.c:121
+#, c-format
+msgid "  -f, --force          force install, overwrite conflicting files\n"
+msgstr "  -f,  -force          强制安装，覆盖存在冲突的文件\n"
+
+#: src/pacman/pacman.c:87
+#, c-format
+msgid ""
+"  -c, --cascade        remove packages and all packages that depend on them\n"
+msgstr "  -c, --cascade        删除软件包及所有的倚赖于此的软件包\n"
+
+#: src/pacman/pacman.c:89
+#, c-format
+msgid ""
+"  -k, --dbonly         only remove database entry, do not remove files\n"
+msgstr "  -k, --dbonly         只删除数据库记录，不删除文件\n"
+
+#: src/pacman/pacman.c:90
+#, c-format
+msgid "  -n, --nosave         remove configuration files as well\n"
+msgstr "  -n, --nosave         同时删除配置文件\n"
+
+#: src/pacman/pacman.c:91
+#, c-format
+msgid ""
+"  -s, --recursive      remove dependencies also (that won't break packages)\n"
+msgstr "  -s, --recursive      同时删除（不会破坏其他软件包的）倚赖关系\n"
+
+#: src/pacman/pacman.c:101
+#, c-format
+msgid "  -c, --changelog      view the changelog of a package\n"
+msgstr "  -c, --changelog      查看某软件包的更新日志\n"
+
+#: src/pacman/pacman.c:102
+#, c-format
+msgid "  -d, --deps           list all packages installed as dependencies\n"
+msgstr "  -d, --deps           列出所有作为倚赖关系安装的软件包\n"
+
+#: src/pacman/pacman.c:103
+#, c-format
+msgid "  -e, --explicit       list all packages explicitly installed\n"
+msgstr "  -e, --explicit       列出所有指定安装的软件包\n"
+
+#: src/pacman/pacman.c:104 src/pacman/pacman.c:122
+#, c-format
+msgid "  -g, --groups         view all members of a package group\n"
+msgstr "  -g, --groups         查看某软件包组所属的所有软件包\n"
+
+#: src/pacman/pacman.c:105
+#, c-format
+msgid ""
+"  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           查看软件包信息（-ii 查看备份文件）\n"
+
+#: src/pacman/pacman.c:106
+#, c-format
+msgid "  -l, --list           list the contents of the queried package\n"
+msgstr "  -l, --list           列出被查询软件包的内容\n"
+
+#: src/pacman/pacman.c:107
+#, c-format
+msgid ""
+"  -m, --foreign        list installed packages not found in sync db(s)\n"
+msgstr "  -m, --foreign        列出没有在同步数据库时找到的已安装软件包\n"
+
+#: src/pacman/pacman.c:108
+#, c-format
+msgid "  -o, --owns <file>    query the package that owns <file>\n"
+msgstr "  -o, --owns <文件>     查询哪个软件包拥有  <文件>\n"
+
+#: src/pacman/pacman.c:109
+#, c-format
+msgid "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -p, --file <软件包> 从某个软件包而不是数据库查询\n"
+
+#: src/pacman/pacman.c:110
+#, c-format
+msgid ""
+"  -s, --search <regex> search locally-installed packages for matching "
+"strings\n"
+msgstr "  -s, --search <regex> 搜寻符合指定字符串的已安装本地的软件包\n"
+
+#: src/pacman/pacman.c:111
+#, c-format
+msgid "  -t, --unrequired     list all packages not required by any package\n"
+msgstr "  -t, --unrequired     列出所有不被其他软件包要求的软件包\n"
+
+#: src/pacman/pacman.c:112
+#, c-format
+msgid "  -u, --upgrades       list all packages that can be upgraded\n"
+msgstr "  -u, --upgrades       列出所有可升级的软件包\n"
+
+#: src/pacman/pacman.c:113
+#, c-format
+msgid "  -q, --quiet          show less information for query and search\n"
+msgstr "  -q, --quiet          在查询或搜索时显示较少的信息\n"
+
+#: src/pacman/pacman.c:118
+#, c-format
+msgid ""
+"  -c, --clean          remove old packages from cache directory (-cc for "
+"all)\n"
+msgstr "  -c, --clean          从缓存目录中删除旧软件包（-cc 清除所有）\n"
+
+#: src/pacman/pacman.c:120
+#, c-format
+msgid "  -e, --dependsonly    install dependencies only\n"
+msgstr "  -e, --dependsonly    仅安装依赖关系\n"
+
+#: src/pacman/pacman.c:123
+#, c-format
+msgid "  -i, --info           view package information\n"
+msgstr "  -i, --info           查看软件包信息\n"
+
+#: src/pacman/pacman.c:124
+#, c-format
+msgid "  -l, --list <repo>    view a list of packages in a repo\n"
+msgstr "  -l, --list <软件库>    查看在该软件库中的软件包清单\n"
+
+#: src/pacman/pacman.c:125
+#, c-format
+msgid ""
+"  -p, --print-uris     print out URIs for given packages and their "
+"dependencies\n"
+msgstr "  -p, --print-uris     打印指定软件包及依赖关系中的URI\n"
+
+#: src/pacman/pacman.c:126
+#, c-format
+msgid ""
+"  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex表达式> 按照指定字符串查找远端软件库\n"
+
+#: src/pacman/pacman.c:127
+#, c-format
+msgid "  -u, --sysupgrade     upgrade all packages that are out of date\n"
+msgstr "  -u, --sysupgrade     升级所有过期软件包\n"
+
+#: src/pacman/pacman.c:128
+#, c-format
+msgid ""
+"  -w, --downloadonly   download packages but do not install/upgrade "
+"anything\n"
+msgstr "  -w, --downloadonly   下载但不安装/升级软件包\n"
+
+#: src/pacman/pacman.c:129
+#, c-format
+msgid ""
+"  -y, --refresh        download fresh package databases from the server\n"
+msgstr "  -y, --refresh        从服务器下载新的软件包数据库\n"
+
+#: src/pacman/pacman.c:130
+#, c-format
+msgid ""
+"      --needed         only upgrade outdated or not yet installed packages\n"
+msgstr "      --needed         仅升级过期或尚未安装的软件包\n"
+
+#: src/pacman/pacman.c:131
+#, c-format
+msgid ""
+"      --ignore <pkg>   ignore a package upgrade (can be used more than "
+"once)\n"
+msgstr "      --ignore <软件包>   升级时忽略某个软件包（可多次使用）\n"
+
+#: src/pacman/pacman.c:132
+#, c-format
+msgid ""
+"      --ignoregroup <grp>\n"
+"                       ignore a group upgrade (can be used more than once)\n"
+msgstr "      --ignoregroup <软件包组>\n  "
+"                       升级时忽略某个软件包组（可多次使用）\n"
+
+#: src/pacman/pacman.c:134
+#, c-format
+msgid "  -q  --quiet          show less information for query and search\n"
+msgstr "  -q  --quiet          查询或搜索时显示较少信息\n"
+
+#: src/pacman/pacman.c:136
+#, c-format
+msgid "      --config <path>  set an alternate configuration file\n"
+msgstr "      --config <路径>  指定另外的配置文件\n"
+
+#: src/pacman/pacman.c:137
+#, c-format
+msgid "      --logfile <path> set an alternate log file\n"
+msgstr "      --logfile <路径> 指定另外的日志文件\n"
+
+#: src/pacman/pacman.c:138
+#, c-format
+msgid "      --noconfirm      do not ask for any confirmation\n"
+msgstr "      --noconfirm      不询问确认\n"
+
+#: src/pacman/pacman.c:139
+#, c-format
+msgid ""
+"      --noprogressbar  do not show a progress bar when downloading files\n"
+msgstr "      --noprogressbar  下载文件时不显示进度条\n"
+
+#: src/pacman/pacman.c:140
+#, c-format
+msgid ""
+"      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgstr "      --noscriptlet    不执行安装脚本\n"
+
+#: src/pacman/pacman.c:141
+#, c-format
+msgid "  -v, --verbose        be verbose\n"
+msgstr "  -v, --verbose        循环执行\n"
+
+#: src/pacman/pacman.c:142
+#, c-format
+msgid "  -r, --root <path>    set an alternate installation root\n"
+msgstr "  -r, --root <路径>    指定另外的安装根目录\n"
+
+#: src/pacman/pacman.c:143
+#, c-format
+msgid "  -b, --dbpath <path>  set an alternate database location\n"
+msgstr "  -b, --dbpath <路径>  指定另外的数据库位置\n"
+
+#: src/pacman/pacman.c:144
+#, c-format
+msgid "      --cachedir <dir> set an alternate package cache location\n"
+msgstr "      --cachedir <目录> 指定另外的软件包缓存位置\n"
+
+#: src/pacman/pacman.c:157
+#, c-format
+msgid ""
+"                       This program may be freely redistributed under\n"
+"                       the terms of the GNU General Public License\n"
+msgstr "                       本程序可以按照GNU条款\n"
+"                       自由分发\n"
+
+#: src/pacman/pacman.c:247
+#, c-format
+msgid "problem setting rootdir '%s' (%s)\n"
+msgstr "设置根目录'%s' (%s)时出现问题 \n"
+
+#: src/pacman/pacman.c:264
+#, c-format
+msgid "problem setting dbpath '%s' (%s)\n"
+msgstr "设置数据库路径'%s' (%s)时出现问题 \n"
+
+#: src/pacman/pacman.c:272
+#, c-format
+msgid "problem setting logfile '%s' (%s)\n"
+msgstr "设置日志文件'%s' (%s)时出现问题\n"
+
+#: src/pacman/pacman.c:382
+#, c-format
+msgid "'%s' is not a valid debug level\n"
+msgstr "'%s' 是一个无效的debug水平\n"
+
+#: src/pacman/pacman.c:396 src/pacman/pacman.c:672
+#, c-format
+msgid "problem adding cachedir '%s' (%s)\n"
+msgstr "设置缓存目录'%s' (%s)时出现问题 \n"
+
+#: src/pacman/pacman.c:482
+msgid "only one operation may be used at a time\n"
+msgstr "一次只能运行一个操作\n"
+
+#: src/pacman/pacman.c:542
+#, c-format
+msgid "config file %s could not be read.\n"
+msgstr "配置文件%s无法读取。\n"
+
+#: src/pacman/pacman.c:578
+#, c-format
+msgid "config file %s, line %d: bad section name.\n"
+msgstr "配置文件%s，第%d行：坏的章节名。\n"
+
+#: src/pacman/pacman.c:600
+#, c-format
+msgid "config file %s, line %d: syntax error in config file- missing key.\n"
+msgstr "配置文件%s，第%d行：配置文件中语法错误－缺少关键字。\n"
+
+#: src/pacman/pacman.c:610
+#, c-format
+msgid "config file %s, line %d: All directives must belong to a section.\n"
+msgstr "配置文件%s，第%d行：所有的命令必须属于同一章节。\n"
+
+#: src/pacman/pacman.c:638 src/pacman/pacman.c:692 src/pacman/pacman.c:707
+#, c-format
+msgid "config file %s, line %d: directive '%s' not recognized.\n"
+msgstr "配置文件%s，第%d行：未知命令'%s'\n"
+
+#: src/pacman/pacman.c:777
+#, c-format
+msgid "failed to initialize alpm library (%s)\n"
+msgstr "初始化alpm库失败(%s)\n"
+
+#: src/pacman/pacman.c:814
+msgid "you cannot perform this operation unless you are root.\n"
+msgstr "非根用户无法执行指定操作。\n"
+
+#: src/pacman/pacman.c:837
+#, c-format
+msgid "could not register 'local' database (%s)\n"
+msgstr "无法登记“本地”数据库(%s)\n"
+
+#: src/pacman/pacman.c:863
+msgid "no operation specified (use -h for help)\n"
+msgstr "没有指定的操作（使用-h获取帮助）\n"
+
+#: src/pacman/query.c:65
+#, c-format
+msgid "error: no file was specified for --owns\n"
+msgstr "错误：没有为--owns指定文件\n"
+
+#: src/pacman/query.c:79
+#, c-format
+msgid "error: failed to read file '%s': %s\n"
+msgstr "错误：无法读取文件'%s': %s\n"
+
+#: src/pacman/query.c:86
+#, c-format
+msgid "error: cannot determine ownership of a directory\n"
+msgstr "错误：无法确定目录的所有者属性\n"
+
+#: src/pacman/query.c:97
+#, c-format
+msgid "error: cannot determine real path for '%s': %s\n"
+msgstr "错误：无法确定'%s': %s的真实路径。\n"
+
+#: src/pacman/query.c:122
+#, c-format
+msgid "%s is owned by %s %s\n"
+msgstr "%s 属于%s %s\n"
+
+#: src/pacman/query.c:130
+#, c-format
+msgid "error: No package owns %s\n"
+msgstr "错误：没有软件包拥有%s\n"
+
+#: src/pacman/query.c:226
+#, c-format
+msgid "error: group \"%s\" was not found\n"
+msgstr "错误：没有找到\"%s\"组\n"
+
+#: src/pacman/query.c:237
+#, c-format
+msgid "Checking for package upgrades... \n"
+msgstr "正在检查软件包更新……\n"
+
+#: src/pacman/query.c:248
+#, c-format
+msgid "no upgrades found.\n"
+msgstr "没有发现更新。\n"
+
+#: src/pacman/query.c:360 src/pacman/sync.c:771
+msgid "no usable package repositories configured.\n"
+msgstr "没有设置可用的软件包库。\n"
+
+#: src/pacman/query.c:404
+#, c-format
+msgid "error: package \"%s\" not found\n"
+msgstr "错误：软件包\"%s\"没有找到\n"
+
+#: src/pacman/remove.c:76
+#, c-format
+msgid ":: group %s:\n"
+msgstr ":: 组 %s:\n"
+
+#: src/pacman/remove.c:78
+msgid "    Remove whole content? [Y/n] "
+msgstr "    删除全部内容？[Y/n]"
+
+#: src/pacman/remove.c:82
+#, c-format
+msgid ":: Remove %s from group %s? [Y/n] "
+msgstr ":: 删除%s从组%s中？[Y/n]"
+
+#: src/pacman/remove.c:95 src/pacman/sync.c:481 src/pacman/sync.c:540
+#, c-format
+msgid "error: failed to init transaction (%s)\n"
+msgstr "错误：无法初始化处理(%s)\n"
+
+#: src/pacman/remove.c:155 src/pacman/util.c:488
+msgid "Targets:"
+msgstr "目标："
+
+#: src/pacman/remove.c:158
+msgid ""
+"\n"
+"Do you want to remove these packages? [Y/n] "
+msgstr "\n"
+"打算删除这些软件包吗？ [Y/n] "
+
+#: src/pacman/sync.c:52
+#, c-format
+msgid "error: could not access database directory\n"
+msgstr "错误：无法进入数据库目录\n"
+
+#: src/pacman/sync.c:84
+#, c-format
+msgid "Do you want to remove %s? [Y/n] "
+msgstr "打算删除%s？[Y/n]"
+
+#: src/pacman/sync.c:89
+#, c-format
+msgid "error: could not remove repository directory\n"
+msgstr "错误：无法删除软件库目录\n"
+
+#: src/pacman/sync.c:102
+#, c-format
+msgid "Database directory: %s\n"
+msgstr "数据库目录：%s\n"
+
+#: src/pacman/sync.c:103
+msgid "Do you want to remove unused repositories? [Y/n] "
+msgstr "打算删除无用的软件库？[Y/n]"
+
+#: src/pacman/sync.c:114
+#, c-format
+msgid "Database directory cleaned up\n"
+msgstr "数据库目录已清除\n"
+
+#: src/pacman/sync.c:132 src/pacman/sync.c:179
+#, c-format
+msgid "Cache directory: %s\n"
+msgstr "缓存目录：%s\n"
+
+#: src/pacman/sync.c:133
+msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
+msgstr "打算从缓存中删除没有安装的软件包吗？[Y/n]"
+
+#: src/pacman/sync.c:136
+#, c-format
+msgid "removing old packages from cache... "
+msgstr "正在从缓存中删除旧软件包……"
+
+#: src/pacman/sync.c:140
+#, c-format
+msgid "error: could not access cache directory\n"
+msgstr "错误：无法进入缓存目录\n"
+
+#: src/pacman/sync.c:180
+msgid "Do you want to remove ALL packages from cache? [Y/n] "
+msgstr "打算从缓存中删除所有软件包吗？[Y/n]"
+
+#: src/pacman/sync.c:183
+#, c-format
+msgid "removing all packages from cache... "
+msgstr "正在从缓存中删除所有软件包……"
+
+#: src/pacman/sync.c:186
+#, c-format
+msgid "error: could not remove cache directory\n"
+msgstr "错误：无法删除缓存目录\n"
+
+#: src/pacman/sync.c:191
+#, c-format
+msgid "error: could not create new cache directory\n"
+msgstr "错误：无法创建新缓存目录\n"
+
+#: src/pacman/sync.c:218
+#, c-format
+msgid "error: failed to synchronize %s: %s\n"
+msgstr "错误：无法同步%s: %s\n"
+
+#: src/pacman/sync.c:221
+#, c-format
+msgid "error: failed to update %s (%s)\n"
+msgstr "错误：无法升级%s (%s)\n"
+
+#: src/pacman/sync.c:225
+#, c-format
+msgid " %s is up to date\n"
+msgstr " %s 已经是最新版本\n"
+
+#: src/pacman/sync.c:368
+#, c-format
+msgid "error: repository '%s' does not exist\n"
+msgstr "错误：软件库'%s'不存在\n"
+
+#: src/pacman/sync.c:383
+#, c-format
+msgid "error: package '%s' was not found in repository '%s'\n"
+msgstr "错误：软件包'%s'没有在'%s'库里找到\n"
+
+#: src/pacman/sync.c:403
+#, c-format
+msgid "error: package '%s' was not found\n"
+msgstr "错误：软件包'%s'没有找到\n"
+
+#: src/pacman/sync.c:440
+#, c-format
+msgid "error: repository \"%s\" was not found.\n"
+msgstr "错误：软件库\"%s\"没有找到\n"
+
+#: src/pacman/sync.c:492
+#, c-format
+msgid ":: Synchronizing package databases...\n"
+msgstr ":: 正在同步软件包数据库……\n"
+
+#: src/pacman/sync.c:495
+#, c-format
+msgid "error: failed to synchronize any databases\n"
+msgstr "错误：无法同步任何数据库\n"
+
+#: src/pacman/sync.c:507
+#, c-format
+msgid ":: Starting full system upgrade...\n"
+msgstr ":: 正在进行全系统升级……\n"
+
+#: src/pacman/sync.c:529
+#, c-format
+msgid ":: pacman has detected a newer version of itself.\n"
+msgstr ":: pacman检测到自身的一个新版本\n"
+
+#: src/pacman/sync.c:530
+msgid ""
+":: Do you want to cancel the current operation\n"
+":: and install the new pacman version now? [Y/n] "
+msgstr ""
+":: 打算取消当前操作\n"
+":: 并马上安装新版本的pacman吗？ [Y/n] "
+
+#: src/pacman/sync.c:533 src/pacman/sync.c:748
+#, c-format
+msgid "error: failed to release transaction (%s)\n"
+msgstr "错误：无法释放处理(%s)\n"
+
+#: src/pacman/sync.c:545
+#, c-format
+msgid "error: pacman: %s\n"
+msgstr "错误：pacman：%s\n"
+
+#: src/pacman/sync.c:584
+#, c-format
+msgid ":: group %s (including ignored packages):\n"
+msgstr ":: 软件包组%s（包含忽略的软件包）：\n"
+
+#: src/pacman/sync.c:589
+msgid ":: Install whole content? [Y/n] "
+msgstr ":: 安装全部内容？[Y/n]"
+
+#: src/pacman/sync.c:596
+#, c-format
+msgid ":: Install %s from group %s? [Y/n] "
+msgstr ":: 安装%s从软件包组%s？[Y/n]"
+
+#: src/pacman/sync.c:617
+#, c-format
+msgid "Warning: %s provides %s\n"
+msgstr "警告：%s已提供%s\n"
+
+#: src/pacman/sync.c:621
+#, c-format
+msgid "error: several packages provide %s, please specify one :\n"
+msgstr "错误：几个软件包都提供%s，请指定一个：\n"
+
+#: src/pacman/sync.c:632
+#, c-format
+msgid "error: '%s': not found in sync db\n"
+msgstr "错误：'%s'：没有在同步数据库中找到\n"
+
+#: src/pacman/sync.c:674
+#, c-format
+msgid " local database is up to date\n"
+msgstr "本地数据库已是最新的\n"
+
+#: src/pacman/sync.c:686
+#, c-format
+msgid "Beginning download...\n"
+msgstr "开始下载……\n"
+
+#: src/pacman/sync.c:689
+msgid "Proceed with download? [Y/n] "
+msgstr "进行下载吗？[Y/n]"
+
+#: src/pacman/sync.c:693
+#, c-format
+msgid "Beginning upgrade process...\n"
+msgstr "开始更新……\n"
+
+#: src/pacman/sync.c:696
+msgid "Proceed with installation? [Y/n] "
+msgstr "进行安装吗？[Y/n]"
+
+#: src/pacman/sync.c:737
+#, c-format
+msgid "Errors occurred, no packages were upgraded.\n"
+msgstr "发生错误，没有软件包进行了更新。\n"
+
+#: src/pacman/util.c:382 src/pacman/util.c:414
+#, c-format
+msgid "None\n"
+msgstr "无\n"
+
+#: src/pacman/util.c:480
+msgid "Remove:"
+msgstr "删除："
+
+#: src/pacman/util.c:484
+#, c-format
+msgid "Total Removed Size:   %.2f MB\n"
+msgstr "全部删除大小：   %.2f MB\n"
+
+#: src/pacman/util.c:491
+#, c-format
+msgid "Total Download Size:    %.2f MB\n"
+msgstr "全部下载大小：   %.2f MB\n"
+
+#: src/pacman/util.c:495
+#, c-format
+msgid "Total Installed Size:   %.2f MB\n"
+msgstr "全部安装大小：  %.2f MB\n"
+
+#: src/pacman/util.c:522
+msgid "Y"
+msgstr "Y"
+
+#: src/pacman/util.c:522
+msgid "YES"
+msgstr "是"
+
+#: src/pacman/util.c:574
+#, c-format
+msgid "error: %s"
+msgstr "错误：%s"
+
+#: src/pacman/util.c:577
+#, c-format
+msgid "warning: %s"
+msgstr "警告：%s"
+
+#: src/pacman/util.c:580
+#, c-format
+msgid "function: %s"
+msgstr "功能：%s"
+
+#: src/pacman/util.c:621
+#, c-format
+msgid "error: "
+msgstr "错误："
+
+#: src/pacman/util.c:624
+#, c-format
+msgid "warning: "
+msgstr "警告："
+
+#: src/pacman/util.c:629
+#, c-format
+msgid "function: "
+msgstr "功能："
+
+#: scripts/gensync.sh.in:32
+msgid "Usage: %s <root> <destfile> [package_directory]"
+msgstr "用法：%s <root> <destfile> [软件包目录]"
+
+#: scripts/gensync.sh.in:33 scripts/gensync.sh.in:122
+#: scripts/updatesync.sh.in:34 scripts/updatesync.sh.in:122
+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"
+
+#: scripts/gensync.sh.in:36
+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来生成一个同步数据库。\\n"
+"gensync会在一个临时目录中创建该数据库\\n"
+"然后压缩到<destfile>.\\n\\n"
+
+#: scripts/gensync.sh.in:40
+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"
+
+#: scripts/gensync.sh.in:43
+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"
+""
+
+#: scripts/gensync.sh.in:49
+msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
+msgstr "例子：gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
+
+#: scripts/gensync.sh.in:54 scripts/makepkg.sh.in:1107
+#: scripts/pacman-optimize.sh.in:57 scripts/repo-remove.sh.in:63
+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"
+
+#: scripts/gensync.sh.in:102 scripts/updatesync.sh.in:101
+msgid "%s not found. Can not continue."
+msgstr "%s 没有找到。无法继续。"
+
+#: scripts/gensync.sh.in:120
+msgid "invalid root dir: %s"
+msgstr "无效的根目录：%s"
+
+#: scripts/gensync.sh.in:126
+msgid "gensync: building database entries, generating md5sums..."
+msgstr "gensync：正在创建数据库记录，正在生成md5值……"
+
+#: scripts/gensync.sh.in:135 scripts/updatesync.sh.in:133
+msgid "failed to parse %s"
+msgstr "无法处理：%s"
+
+#: scripts/gensync.sh.in:146
+msgid "could not find %s-%s-%s-%s%s - skipping"
+msgstr "无法找到%s-%s-%s-%s%s - 跳过"
+
+#: scripts/gensync.sh.in:156
+msgid "creating repo DB..."
+msgstr "正在产生库DB……"
+
+#: scripts/makepkg.sh.in:100 scripts/makepkg.sh.in:102
+#: scripts/repo-add.sh.in:46 scripts/repo-remove.sh.in:42
+msgid "WARNING:"
+msgstr "警告："
+
+#: scripts/makepkg.sh.in:109 scripts/makepkg.sh.in:111
+#: scripts/repo-add.sh.in:51 scripts/repo-remove.sh.in:47
+msgid "ERROR:"
+msgstr "错误："
+
+#: scripts/makepkg.sh.in:142
+msgid "Cleaning up..."
+msgstr "正在清理……"
+
+#: scripts/makepkg.sh.in:192
+msgid ""
+"Options beginning with 'no' will be deprecated in the next version of "
+"makepkg!"
+msgstr "开始于'no'的选项将在makepkg的下个版本中放弃。"
+
+#: scripts/makepkg.sh.in:193
+msgid "Please replace 'no' with '!': %s -> %s."
+msgstr "请用'!'代替'no'：%s -> %s"
+
+#: scripts/makepkg.sh.in:197
+msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
+msgstr "'keepdocs'选项也许不像计划那样工作。请用'docs'代替。"
+
+#: scripts/makepkg.sh.in:285
+msgid "There is no agent set up to handle %s URLs. Check %s."
+msgstr "没有设置程序来处理%s URLs。检查%s。"
+
+#: scripts/makepkg.sh.in:286 scripts/makepkg.sh.in:295
+#: scripts/makepkg.sh.in:448 scripts/makepkg.sh.in:482
+#: scripts/makepkg.sh.in:528 scripts/makepkg.sh.in:616
+#: scripts/makepkg.sh.in:644 scripts/makepkg.sh.in:706
+#: scripts/makepkg.sh.in:781 scripts/makepkg.sh.in:1124
+#: scripts/makepkg.sh.in:1437 scripts/makepkg.sh.in:1441
+msgid "Aborting..."
+msgstr "正在中断……"
+
+#: scripts/makepkg.sh.in:294
+msgid "The download program %s is not installed."
+msgstr "下载的程序%s没有被安装。"
+
+#: scripts/makepkg.sh.in:310
+msgid "Pacman returned a fatal error (%i): %s"
+msgstr "Pacman出现致命错误(%i):：%s"
+
+#: scripts/makepkg.sh.in:334
+msgid "Installing missing dependencies..."
+msgstr "正在安装缺少的依赖关系……"
+
+#: scripts/makepkg.sh.in:344
+msgid "Pacman failed to install missing dependencies."
+msgstr "Pacman无法安装缺少的依赖关系……"
+
+#: scripts/makepkg.sh.in:348
+msgid "Building missing dependencies..."
+msgstr "正在创建缺少的依赖关系……"
+
+#: scripts/makepkg.sh.in:353
+msgid "Source root cannot be found - please make sure it is specified in %s."
+msgstr "源码根目录没有找到－清确认已在%s指定。"
+
+#: scripts/makepkg.sh.in:361
+msgid "Could not find '%s' under %s"
+msgstr "无法在 %s下面找到'%s' 。"
+
+#: scripts/makepkg.sh.in:378
+msgid "Failed to build '%s'"
+msgstr "无法编译'%s'"
+
+#: scripts/makepkg.sh.in:411
+msgid "Failed to install all missing dependencies."
+msgstr "无法安装所有缺少的依赖关系。"
+
+#: scripts/makepkg.sh.in:414
+msgid "Missing Dependencies:"
+msgstr "缺少依赖关系："
+
+#: scripts/makepkg.sh.in:444
+msgid "Retrieving Sources..."
+msgstr "获取源代码……"
+
+#: scripts/makepkg.sh.in:447
+msgid "You do not have write permission to store downloads in %s."
+msgstr "你没有写权力把下载存放在%s"
+
+#: scripts/makepkg.sh.in:458
+msgid "Found %s in build dir"
+msgstr "在创建目录中找到%s"
+
+#: scripts/makepkg.sh.in:462
+msgid "Using cached copy of %s"
+msgstr "使用%s在缓存中的复制版本"
+
+#: scripts/makepkg.sh.in:469
+msgid "%s was not found in the build directory and is not a URL."
+msgstr "%s没有在创建目录中找到，也不是一个URL。"
+
+#: scripts/makepkg.sh.in:476
+msgid "Downloading %s..."
+msgstr "正在下载%s……"
+
+#: scripts/makepkg.sh.in:481
+msgid "Failure while downloading %s"
+msgstr "无法下载%s"
+
+#: scripts/makepkg.sh.in:492
+msgid "Generating checksums for source files..."
+msgstr "正在为源代码文件创建完整性检查值……"
+
+#: scripts/makepkg.sh.in:501
+msgid "Invalid integrity algorithm '%s' specified."
+msgstr "指定了无效的'%s'完整性编码"
+
+#: scripts/makepkg.sh.in:506 scripts/makepkg.sh.in:558
+msgid "Cannot find the '%s' program."
+msgstr "无法找到'%s'程序。"
+
+#: scripts/makepkg.sh.in:527
+msgid "Unable to find source file %s to generate checksum."
+msgstr "无法找到源代码文件%s来创建完整性检查码。"
+
+#: scripts/makepkg.sh.in:553
+msgid "Invalid integrity algorithm '%s' specified"
+msgstr "指定了无效的'%s' 完整性编码"
+
+#: scripts/makepkg.sh.in:564
+msgid "Validating source files with %s..."
+msgstr "正在检查源码完整性%s……"
+
+#: scripts/makepkg.sh.in:574
+msgid "NOT FOUND"
+msgstr "没有找到"
+
+#: scripts/makepkg.sh.in:583
+msgid "Passed"
+msgstr "通过"
+
+#: scripts/makepkg.sh.in:585
+msgid "FAILED"
+msgstr "失败"
+
+#: scripts/makepkg.sh.in:593
+msgid "One or more files did not pass the validity check!"
+msgstr "一个或多个文件没有通过有效性检查！"
+
+#: scripts/makepkg.sh.in:597
+msgid "Integrity checks (%s) are missing or incomplete."
+msgstr "完整性检查(%s)去少或者不完全"
+
+#: scripts/makepkg.sh.in:603
+msgid "Extracting Sources..."
+msgstr "解压缩源码……"
+
+#: scripts/makepkg.sh.in:615
+msgid "Unable to find source file %s for extraction."
+msgstr "无法找到源码文件%s来解压缩。"
+
+#: scripts/makepkg.sh.in:643
+msgid "Failed to extract %s"
+msgstr "无法解压缩%s"
+
+#: scripts/makepkg.sh.in:675
+msgid "Starting build()..."
+msgstr "开始创建……"
+
+#: scripts/makepkg.sh.in:705
+msgid "Build Failed."
+msgstr "创建失败。"
+
+#: scripts/makepkg.sh.in:714
+msgid "Tidying install..."
+msgstr "正在整洁安装……"
+
+#: scripts/makepkg.sh.in:717
+msgid "Removing info/doc files..."
+msgstr "正在删除info/doc文件……"
+
+#: scripts/makepkg.sh.in:722
+msgid "Compressing man pages..."
+msgstr "正在压缩man帮助页……"
+
+#: scripts/makepkg.sh.in:756
+msgid "Stripping debugging symbols from binaries and libraries..."
+msgstr "正在从二进制执行文件和库中删除debug符号……"
+
+#: scripts/makepkg.sh.in:768
+msgid "Removing libtool .la files..."
+msgstr "正在删除libtool .la 文件……"
+
+#: scripts/makepkg.sh.in:773
+msgid "Removing empty directories..."
+msgstr "正在删除空目录……"
+
+#: scripts/makepkg.sh.in:780
+msgid "Missing pkg/ directory."
+msgstr "缺少pkg/目录。"
+
+#: scripts/makepkg.sh.in:786
+msgid "Creating package..."
+msgstr "正在创建软件包……"
+
+#: scripts/makepkg.sh.in:797
+msgid "Generating .PKGINFO file..."
+msgstr "正在生成.PKGINFO文件……"
+
+#: scripts/makepkg.sh.in:846
+msgid "Please add a license line to your %s!"
+msgstr "请添加版权声明行到你的%s！"
+
+#: scripts/makepkg.sh.in:847
+msgid "Example for GPL'ed software: license=('GPL')."
+msgstr "GPL软件的列子：license=('GPL')"
+
+#: scripts/makepkg.sh.in:855 scripts/makepkg.sh.in:950
+msgid "Adding install script..."
+msgstr "正在添加安装脚本……"
+
+#: scripts/makepkg.sh.in:862
+msgid "Adding package changelog..."
+msgstr "正在添加软件包更新日志……"
+
+#: scripts/makepkg.sh.in:868
+msgid "Compressing package..."
+msgstr "正在压缩软件包……"
+
+#: scripts/makepkg.sh.in:873
+msgid "Failed to create package file."
+msgstr "无法创建软件包文件。"
+
+#: scripts/makepkg.sh.in:882
+msgid "Cannot find the xdelta binary! Is xdelta installed?"
+msgstr "无法找到xdelta执行文件！是否xdelta已经安装？"
+
+#: scripts/makepkg.sh.in:912
+msgid "Making delta from version %s..."
+msgstr "正在从版本%s制作delta……"
+
+#: scripts/makepkg.sh.in:926
+msgid "Recreating package tarball from delta to match md5 signatures"
+msgstr "正在从delta重新生成软件包打包文档以符合md5签名"
+
+#: scripts/makepkg.sh.in:927
+msgid "NOTE: the delta should ONLY be distributed with this tarball"
+msgstr "注意：本delta应当只与本压缩包一起分发"
+
+#: scripts/makepkg.sh.in:931
+msgid "Could not generate the package from the delta."
+msgstr "无法从delta中生成软件包。"
+
+#: scripts/makepkg.sh.in:935
+msgid "Delta was not able to be created."
+msgstr "无法创建delta。"
+
+#: scripts/makepkg.sh.in:938
+msgid "No previous version found, skipping xdelta."
+msgstr "没有发现先前版本，跳过xdelta。"
+
+#: scripts/makepkg.sh.in:944
+msgid "Creating source package..."
+msgstr "正在创建源码包……"
+
+#: scripts/makepkg.sh.in:946 scripts/makepkg.sh.in:958
+#: scripts/makepkg.sh.in:965
+msgid "Adding %s..."
+msgstr "正在添加%s……"
+
+#: scripts/makepkg.sh.in:953
+msgid "Install script %s not found."
+msgstr "安装脚本%s没有找到。"
+
+#: scripts/makepkg.sh.in:973
+msgid "Compressing source package..."
+msgstr "正在压缩源码包……"
+
+#: scripts/makepkg.sh.in:975
+msgid "Failed to create source package file."
+msgstr "创建源码包文件失败。"
+
+#: scripts/makepkg.sh.in:1005
+msgid "Determining latest darcs revision..."
+msgstr "正在确认最新的darcs修正……"
+
+#: scripts/makepkg.sh.in:1009
+msgid "Determining latest cvs revision..."
+msgstr "正在确认最新的cvs修正……"
+
+#: scripts/makepkg.sh.in:1013
+msgid "Determining latest git revision..."
+msgstr "正在确认最新的git修正……"
+
+#: scripts/makepkg.sh.in:1017
+msgid "Determining latest svn revision..."
+msgstr "正在确认最新的svn修正……"
+
+#: scripts/makepkg.sh.in:1021
+msgid "Determining latest bzr revision..."
+msgstr "正在确认最新的bzr修正……"
+
+#: scripts/makepkg.sh.in:1025
+msgid "Determining latest hg revision..."
+msgstr "正在确认最新的hg修正……"
+
+#: scripts/makepkg.sh.in:1040
+msgid "Version found: %s"
+msgstr "找到版本：%s"
+
+#: scripts/makepkg.sh.in:1071
+msgid "Usage: %s [options]"
+msgstr "用法：%s [选项]"
+
+#: scripts/makepkg.sh.in:1073
+msgid "Options:"
+msgstr "选项："
+
+#: scripts/makepkg.sh.in:1074
+msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
+msgstr "  -A, --ignorearch 忽略%s中的不完全的arch段"
+
+#: scripts/makepkg.sh.in:1075
+msgid "  -b, --builddeps  Build missing dependencies from source"
+msgstr "  -b, --builddeps  从源码编译缺少的依赖关系"
+
+#: scripts/makepkg.sh.in:1076
+msgid "  -c, --clean      Clean up work files after build"
+msgstr "  -c, --clean      编译后清理工作文件"
+
+#: scripts/makepkg.sh.in:1077
+msgid "  -C, --cleancache Clean up source files from the cache"
+msgstr "  -C, --cleancache 从缓存中清理源码文件"
+
+#: scripts/makepkg.sh.in:1078
+msgid "  -d, --nodeps     Skip all dependency checks"
+msgstr " -d, --nodeps     跳过所有依赖关系检查"
+
+#: scripts/makepkg.sh.in:1079
+msgid "  -e, --noextract  Do not extract source files (use existing src/ dir)"
+msgstr "  -e, --noextract  不解压缩源码文件（使用现存的src/目录）"
+
+#: scripts/makepkg.sh.in:1080
+msgid "  -f, --force      Overwrite existing package"
+msgstr "  -f, --force      覆盖现存的软件包"
+
+#: scripts/makepkg.sh.in:1081
+msgid "  -g, --geninteg   Generate integrity checks for source files"
+msgstr "  -g, --geninteg   为源码文件生成完整性检查值"
+
+#: scripts/makepkg.sh.in:1082
+msgid "  -h, --help       This help"
+msgstr "  -h, --help       获得帮助"
+
+#: scripts/makepkg.sh.in:1083
+msgid "  -i, --install    Install package after successful build"
+msgstr "  -i, --install    成功编译后安装软件包"
+
+#: scripts/makepkg.sh.in:1084
+msgid "  -L, --log        Log package build process"
+msgstr "  -L, --log        记录软件包编译过程"
+
+#: scripts/makepkg.sh.in:1085
+msgid "  -m, --nocolor    Disable colorized output messages"
+msgstr "  -m, --nocolor    禁止彩色输出信息"
+
+#: scripts/makepkg.sh.in:1086
+msgid "  -o, --nobuild    Download and extract files only"
+msgstr "  -o, --nobuild    仅下载和解压缩文件"
+
+#: scripts/makepkg.sh.in:1087
+msgid "  -p <buildscript> Use an alternate build script (instead of '%s')"
+msgstr "  -p <编译脚本> 使用另外的编译脚本（而不是'%s'）"
+
+#: scripts/makepkg.sh.in:1088
+msgid ""
+"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
+
+#: scripts/makepkg.sh.in:1090
+msgid "  -R, --repackage  Repackage contents of pkg/ without building"
+msgstr "  -R, --repackage  不编译而重新打包pkg/内容"
+
+#: scripts/makepkg.sh.in:1091
+msgid "  -s, --syncdeps   Install missing dependencies with pacman"
+msgstr "  -s, --syncdeps   使用pacman安装缺少的依赖关系"
+
+#: scripts/makepkg.sh.in:1092
+msgid "      --asroot     Allow makepkg to run as root user"
+msgstr "      --asroot     允许makepkg作为root用户运行"
+
+#: scripts/makepkg.sh.in:1093
+msgid ""
+"      --holdver    Prevent automatic version bumping for development "
+"PKGBUILDs"
+msgstr "      --holdver    为开发中的PKGBUILD防止自动版本更新"
+
+#: scripts/makepkg.sh.in:1094
+msgid "      --source     Do not build package; generate a source-only tarball"
+msgstr "    --source     不编译软件包，仅仅生成源码包"
+
+#: scripts/makepkg.sh.in:1096
+msgid "These options can be passed to pacman:"
+msgstr "这些选项可以传递给pacman："
+
+#: scripts/makepkg.sh.in:1098
+msgid ""
+"      --noconfirm      Do not ask for confirmation when resolving "
+"dependencies"
+msgstr ""
+"      --noconfirm      当解决依赖关系时不询问确认"
+
+#: scripts/makepkg.sh.in:1099
+msgid ""
+"      --noprogressbar  Do not show a progress bar when downloading files"
+msgstr "      --noprogressbar  下载时不显示进度条"
+
+#: scripts/makepkg.sh.in:1101
+msgid "If -p is not specified, makepkg will look for '%s'"
+msgstr "如果没有指定 -p ，makepkg将寻找'%s'"
+
+#: scripts/makepkg.sh.in:1123
+msgid "%s not found."
+msgstr "%s 没有找到。"
+
+#: scripts/makepkg.sh.in:1185
+msgid "Sudo is used by default now. The --usesudo option is deprecated!"
+msgstr "现在默认使用sudo。--usesudo选项将逐步放弃！"
+
+#: scripts/makepkg.sh.in:1200
+msgid "\\0--holdver and --forcever cannot both be specified"
+msgstr "\\0--holdver 和 --forcever 不能同时指定。"
+
+#: scripts/makepkg.sh.in:1207
+msgid "Cleaning up ALL files from %s."
+msgstr "正在从%s中清理所有文件。"
+
+#: scripts/makepkg.sh.in:1208
+msgid "    Are you sure you wish to do this? [Y/n] "
+msgstr "    你确认要这样做吗？[Y/n]"
+
+#: scripts/makepkg.sh.in:1214
+msgid "Problem removing files; you may not have correct permissions in %s"
+msgstr "删除文件发生错误；在%s你可能没有正确的权限。"
+
+#: scripts/makepkg.sh.in:1218
+msgid "Source cache cleaned."
+msgstr "源码缓存已清除。"
+
+#: scripts/makepkg.sh.in:1223
+msgid "No files have been removed."
+msgstr "没有文件被删除。"
+
+#: scripts/makepkg.sh.in:1228
+msgid "Source destination must be defined in makepkg.conf."
+msgstr "必须makepkg.conf在指定源码目标地。"
+
+#: scripts/makepkg.sh.in:1229
+msgid "In addition, please run makepkg -C outside of your cache directory."
+msgstr "此外，请在你缓存目录外运行makepkg -C。"
+
+#: scripts/makepkg.sh.in:1235
+msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
+msgstr "BUILDSCRIPT 没有指定！确信你已经更新过%s。"
+
+#: scripts/makepkg.sh.in:1242
+msgid "Running makepkg as root is a BAD idea and can cause"
+msgstr "作为root运行makepkg是个糟糕透顶的主义，可能会导致"
+
+#: scripts/makepkg.sh.in:1243
+msgid "permanent, catastrophic damage to your system. If you"
+msgstr "你的系统永远的，灾难性的损坏；如果你"
+
+#: scripts/makepkg.sh.in:1244
+msgid "wish to run as root, please use the --asroot option."
+msgstr "希望作为root来运行，请使用--asroot选项。"
+
+#: scripts/makepkg.sh.in:1248
+msgid "The --asroot option is meant for the root user only."
+msgstr "--asroot选项仅针对root用户。"
+
+#: scripts/makepkg.sh.in:1249
+msgid "Please rerun makepkg without the --asroot flag."
+msgstr "请重新运行makepkg而不带--asroot参数。"
+
+#: scripts/makepkg.sh.in:1253
+msgid "Fakeroot must be installed if using the 'fakeroot' option"
+msgstr "Fakeroot必须安装，如果使用了'fakeroot'选项"
+
+#: scripts/makepkg.sh.in:1254
+msgid "in the BUILDENV array in %s."
+msgstr "在%s的BUILDENV中。"
+
+#: scripts/makepkg.sh.in:1258
+msgid "Running makepkg as an unprivileged user will result in non-root"
+msgstr "作为非特权用户运行makepkg将导致打包文件的"
+
+#: scripts/makepkg.sh.in:1259
+msgid "ownership of the packaged files. Try using the fakeroot environment by"
+msgstr "拥有者权限为非根用户。请尝试通过在makepkg.conf中的"
+
+#: scripts/makepkg.sh.in:1260
+msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
+msgstr "BUILDENV行设置为'fakeroot'来使用fakeroot环境。"
+
+#: scripts/makepkg.sh.in:1265
+msgid "Do not use the '-F' option. This option is only for use by makepkg."
+msgstr "不用使用'-F'选项。该选项仅仅由makepkg使用。"
+
+#: scripts/makepkg.sh.in:1274
+msgid "Cannot find the sudo binary! Is sudo installed?"
+msgstr "无法找到sudo命令！sudo是否已安装？"
+
+#: scripts/makepkg.sh.in:1275
+msgid "Missing dependencies cannot be installed or removed as a normal user"
+msgstr "无法作为普通用户来安装或删除缺少的依赖关系"
+
+#: scripts/makepkg.sh.in:1276
+msgid "without sudo; install and configure sudo to auto-resolve dependencies."
+msgstr "没有sudo；请安装和配置sudo以自动解决依赖关系。"
+
+#: scripts/makepkg.sh.in:1286
+msgid "%s does not exist."
+msgstr "%s 不存在。"
+
+#: scripts/makepkg.sh.in:1301 scripts/makepkg.sh.in:1305
+#: scripts/makepkg.sh.in:1309
+msgid "%s is not allowed to be empty."
+msgstr "%s 不允许为空。"
+
+#: scripts/makepkg.sh.in:1313 scripts/makepkg.sh.in:1317
+msgid "%s is not allowed to contain hyphens."
+msgstr "%s 不允许含有"
+
+#: scripts/makepkg.sh.in:1327 scripts/makepkg.sh.in:1332
+msgid "%s is not available for the '%s' architecture."
+msgstr "%s 在'%s'架构中不可用。"
+
+#: scripts/makepkg.sh.in:1328 scripts/makepkg.sh.in:1333
+msgid "Note that many packages may need a line added to their %s"
+msgstr "注意许多软件包都需要添加一行到他们的%s"
+
+#: scripts/makepkg.sh.in:1329 scripts/makepkg.sh.in:1334
+msgid "such as arch=('%s')."
+msgstr "诸如arch=('%s')."
+
+#: scripts/makepkg.sh.in:1339
+msgid "Install scriptlet (%s) does not exist."
+msgstr "安装脚本(%s)不存在。"
+
+#: scripts/makepkg.sh.in:1353
+msgid "A package has already been built, installing existing package..."
+msgstr "已有一个编译好的软件包，正在安装现存的软件包……"
+
+#: scripts/makepkg.sh.in:1357 scripts/makepkg.sh.in:1388
+msgid "A package has already been built. (use -f to overwrite)"
+msgstr "已有一个编译好的软件包。（使用-f覆盖）"
+
+#: scripts/makepkg.sh.in:1366 scripts/makepkg.sh.in:1465
+msgid "Skipping build."
+msgstr "跳过编译。"
+
+#: scripts/makepkg.sh.in:1374
+msgid "Leaving fakeroot environment."
+msgstr "正在离开fakeroot环境。"
+
+#: scripts/makepkg.sh.in:1378
+msgid "Making package: %s"
+msgstr "正在创建软件包：%s"
+
+#: scripts/makepkg.sh.in:1381
+msgid "Running makepkg as root..."
+msgstr "正在作为root运行makepkg……"
+
+#: scripts/makepkg.sh.in:1392
+msgid "Source package created: %s"
+msgstr "源码包已创建：%s"
+
+#: scripts/makepkg.sh.in:1399
+msgid "Skipping dependency checks."
+msgstr "跳过依赖关系检查。"
+
+#: scripts/makepkg.sh.in:1406
+msgid "Checking Runtime Dependencies..."
+msgstr "正在检查运行时依赖关系……"
+
+#: scripts/makepkg.sh.in:1409
+msgid "Checking Buildtime Dependencies..."
+msgstr "正在检查编译时依赖关系……"
+
+#: scripts/makepkg.sh.in:1413
+msgid "Could not resolve all dependencies."
+msgstr "无法解决所有的依赖关系。"
+
+#: scripts/makepkg.sh.in:1417
+msgid "pacman was not found in PATH; skipping dependency checks."
+msgstr "没有在指定路径找到pacman；跳过依赖关系检查。"
+
+#: scripts/makepkg.sh.in:1431
+msgid "Skipping source retrieval        -- using existing src/ tree"
+msgstr "跳过源码获取        -- 使用现存的src/"
+
+#: scripts/makepkg.sh.in:1432
+msgid "Skipping source integrity checks -- using existing src/ tree"
+msgstr "跳过源码完整性检查 -- 使用现存的src/"
+
+#: scripts/makepkg.sh.in:1433
+msgid "Skipping source extraction       -- using existing src/ tree"
+msgstr "跳过源码解压缩       -- 使用现存的src/"
+
+#: scripts/makepkg.sh.in:1436
+msgid "The source directory is empty, there is nothing to build!"
+msgstr "源码目录为空，没有东东可编译。"
+
+#: scripts/makepkg.sh.in:1440
+msgid "The package directory is empty, there is nothing to repackage!"
+msgstr "源码目录为空，没有东东可打包。"
+
+#: scripts/makepkg.sh.in:1451
+msgid "Sources are ready."
+msgstr "源码已准备好。"
+
+#: scripts/makepkg.sh.in:1456
+msgid "Removing existing pkg/ directory..."
+msgstr "正在删除现存的pkg/目录……"
+
+#: scripts/makepkg.sh.in:1474
+msgid "Entering fakeroot environment..."
+msgstr "正在进入fakeroot环境……"
+
+#: scripts/makepkg.sh.in:1486
+msgid "Finished making: %s"
+msgstr "完成创建：%s"
+
+#: scripts/pacman-optimize.sh.in:42
+msgid "Usage: %s [pacman_db_root]"
+msgstr "用法：%s [pacman_db_root]"
+
+#: scripts/pacman-optimize.sh.in:43
+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"
+
+#: scripts/pacman-optimize.sh.in:46
+msgid ""
+"Because pacman uses many small files to keep track of packages,\\nthere is a "
+"tendency for these files to become fragmented over time.\\nThis script "
+"attempts to relocate these small files into one\\ncontinuous location on "
+"your hard drive. The result is that the hard\\ndrive should be able to read "
+"them faster, since the hard drive head\\ndoes not have to move around the "
+"disk as much.\\n"
+msgstr "因为pacman使用许多小文件来记录软件包。\\n久而久之"
+"这些文件有倾向变得零碎。\\n这个脚本尝试把这些小文件"
+"重新放置到你硬盘上的一个连续的位置。\\n"
+"结果是硬盘由于不用再在碟片上移来移去，"
+"从而可以读取得更快。\\n"
+
+#: scripts/pacman-optimize.sh.in:89
+msgid "diff tool was not found, please install diffutils."
+msgstr "diff工具没有找到，请安装diffutils。"
+
+#: scripts/pacman-optimize.sh.in:94
+msgid "Pacman lock file was found. Cannot run while pacman is running."
+msgstr "Pacman锁文件找到。无法在pacman运行时再次运行。"
+
+#: scripts/pacman-optimize.sh.in:98
+msgid "%s does not exist or is not a directory."
+msgstr "%s不存在或不是一个目录。"
+
+#: scripts/pacman-optimize.sh.in:102
+msgid "You must have correct permissions to optimize the database."
+msgstr "必须拥有正确的权限才能优化数据库。"
+
+#: scripts/pacman-optimize.sh.in:106
+msgid "ERROR: Can not create temp directory for database building."
+msgstr "错误：无法为数据库建立创建空目录。"
+
+#: scripts/pacman-optimize.sh.in:112
+msgid "MD5sum'ing the old database..."
+msgstr "正在为旧数据库创建MD5值……"
+
+#: scripts/pacman-optimize.sh.in:116
+msgid "Tar'ing up %s..."
+msgstr "正在打包%s……"
+
+#: scripts/pacman-optimize.sh.in:121
+msgid "Tar'ing up %s failed."
+msgstr "正在打包%s失败。"
+
+#: scripts/pacman-optimize.sh.in:125
+msgid "Making and MD5sum'ing the new db..."
+msgstr "生成新数据库及md5检查值……"
+
+#: scripts/pacman-optimize.sh.in:130
+msgid "Untar'ing %s failed."
+msgstr "解包%s失败。"
+
+#: scripts/pacman-optimize.sh.in:136
+msgid "Checking integrity..."
+msgstr "正在检查完整性……"
+
+#: scripts/pacman-optimize.sh.in:142
+msgid "Integrity check FAILED, reverting to old database."
+msgstr "完整性检查失败，恢复到老数据库。"
+
+#: scripts/pacman-optimize.sh.in:147
+msgid "Putting the new database in place..."
+msgstr "正在把新的数据库放置到位……"
+
+#: scripts/pacman-optimize.sh.in:156
+msgid "Finished. Your pacman database has been optimized."
+msgstr "完毕。你的pacman数据库已经优化。"
+
+#: scripts/pacman-optimize.sh.in:157
+msgid "For full benefits of pacman-optimize, run 'sync' now."
+msgstr "为了充分享受到pacman-optimize的好处，现在运行'sync' 吧。"
+
+#: scripts/repo-add.sh.in:57
+msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
+msgstr "用法：%s <path-to-db> [--force] <package> ...\\n\\n"
+
+#: scripts/repo-add.sh.in:58
+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"
+
+#: scripts/repo-add.sh.in:61
+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"
+msgstr "--force参数将在同步数据库中添加“强制”记录，"
+"\\n这将告诉pacman跳过内部的版本检查，"
+"\\n直接更新软件包\\n\\n"
+
+#: scripts/repo-add.sh.in:65
+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"
+
+#: scripts/repo-add.sh.in:70
+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"
+msgstr "Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\n"
+"这是一个免费软件；版权条款见源码。\\n"
+"不提供任何法律所规定的保证\\n"
+
+#: scripts/repo-add.sh.in:174
+msgid "Invalid package file '%s'."
+msgstr "无效的软件包文件'%s'。"
+
+#: scripts/repo-add.sh.in:183 scripts/repo-remove.sh.in:88
+msgid "Removing existing package '%s'..."
+msgstr "正在删除现有的软件包'%s'……"
+
+#: scripts/repo-add.sh.in:193
+msgid "Creating 'desc' db entry..."
+msgstr "正在生成'desc'数据库记录"
+
+#: scripts/repo-add.sh.in:203
+msgid "Computing md5 checksums..."
+msgstr "正在计算md5检查值……"
+
+#: scripts/repo-add.sh.in:215
+msgid "Creating 'depends' db entry..."
+msgstr "正在生成'depends'数据库记录……"
+
+#: scripts/repo-add.sh.in:231
+msgid "Creating 'deltas' db entry..."
+msgstr "正在生成'deltas'数据库记录……"
+
+#: scripts/repo-add.sh.in:237
+msgid "Added delta '%s'"
+msgstr "已添加delta '%s'"
+
+#: scripts/repo-add.sh.in:239
+msgid "Could not add delta '%s'"
+msgstr "无法添加delta '%s'"
+
+#: scripts/repo-add.sh.in:277 scripts/repo-remove.sh.in:120
+msgid "%s not found. Cannot continue."
+msgstr "%s 没有找到。无法继续。"
+
+#: scripts/repo-add.sh.in:287 scripts/repo-remove.sh.in:130
+msgid "Cannot create temp directory for database building."
+msgstr "无法为建立数据库创建空目录。"
+
+#: scripts/repo-add.sh.in:298 scripts/repo-remove.sh.in:139
+msgid "Repository file '%s' is not a proper pacman database."
+msgstr "库文件'%s'不是一个有效的pacman数据库。"
+
+#: scripts/repo-add.sh.in:301 scripts/repo-remove.sh.in:142
+msgid "Extracting database to a temporary location..."
+msgstr "正在解压缩数据库到一个临时目录……"
+
+#: scripts/repo-add.sh.in:307
+msgid "'%s' is not a package file, skipping"
+msgstr "'%s' 不是一个软件包文件，跳过"
+
+#: scripts/repo-add.sh.in:309
+msgid "Adding package '%s'"
+msgstr "正在添加软件包'%s'"
+
+#: scripts/repo-add.sh.in:316
+msgid "Package '%s' not found."
+msgstr "软件包'%s'没有找到。"
+
+#: scripts/repo-add.sh.in:323
+msgid "Creating updated database file %s"
+msgstr "正在生成更新的数据库文件%s"
+
+#: scripts/repo-add.sh.in:333 scripts/repo-remove.sh.in:167
+msgid "No compression set."
+msgstr "没有设置压缩。"
+
+#: scripts/repo-add.sh.in:341 scripts/repo-remove.sh.in:178
+msgid "No packages modified, nothing to do."
+msgstr "没有软件包被修改，无事可做。"
+
+#: scripts/repo-remove.sh.in:52
+msgid "repo-remove %s\\n\\n"
+msgstr "repo-remove %s\\n\\n"
+
+#: scripts/repo-remove.sh.in:53
+msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
+msgstr "用法：%s <path-to-db> <packagename> ...\\n\\n"
+
+#: scripts/repo-remove.sh.in:54
+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"
+
+#: scripts/repo-remove.sh.in:58
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+msgstr "例子：repo-remove /path/to/repo.db.tar.gz kernel26"
+
+#: scripts/repo-remove.sh.in:146
+msgid "Searching for package '%s'..."
+msgstr "正在搜索软件包'%s……"
+
+#: scripts/repo-remove.sh.in:151
+msgid "Package matching '%s' not found."
+msgstr "符合'%s'的软件包没有找到。"
+
+#: scripts/repo-remove.sh.in:158
+msgid "Creating updated database file '%s'..."
+msgstr "正在生成更新的数据库文件 '%s'……"
+
+#: scripts/repo-remove.sh.in:172
+msgid "All packages have been removed from the database. Deleting '%s'."
+msgstr "所有软件包已经从数据库中删除。正在删除'%s'。"
+
+#: scripts/updatesync.sh.in:33
+msgid "Usage: %s <action> <destfile> <option> [package_directory]"
+msgstr "用法：%s <action> <destfile> <option> [package_directory]"
+
+#: scripts/updatesync.sh.in:37
+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"
+
+#: scripts/updatesync.sh.in:41
+msgid "There are two types of actions:\\n\\n"
+msgstr "有两种行为：\\n\\n"
+
+#: scripts/updatesync.sh.in:42
+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"
+
+#: scripts/updatesync.sh.in:43
+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"
+
+#: scripts/updatesync.sh.in:45
+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"
+
+#: scripts/updatesync.sh.in:48
+msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
+msgstr "例子：updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
+
+#: scripts/updatesync.sh.in:53
+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"
+
+#: scripts/updatesync.sh.in:128 scripts/updatesync.sh.in:152
+msgid "%s not found"
+msgstr "%s 没有找到"
+
+#: scripts/updatesync.sh.in:140
+msgid "could not find %s-%s-%s-%s%s - aborting"
+msgstr "无法找到%s-%s-%s-%s%s - 放弃"
+
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index d4de0567..b16c79ee 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -34,8 +34,6 @@
 #include "util.h"
 #include "conf.h"
 
-#define FILENAME_TRIM_LEN 23
-
 /* download progress bar */
 static float rate_last;
 static int xfered_last;
@@ -313,8 +311,11 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 
 	/* size of line to allocate for text printing (e.g. not progressbar) */
 	const int infolen = 50;
-	int tmp, digits, oprlen, textlen, remainlen;
+	int tmp, digits, textlen;
 	char *opr = NULL;
+	/* used for wide character width determination and printing */
+	int len, wclen, wcwid, padwid;
+	wchar_t *wcstr;
 
 	if(config->noprogressbar) {
 		return;
@@ -363,27 +364,41 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
 	while((tmp /= 10)) {
 		++digits;
 	}
-
 	/* determine room left for non-digits text [not ( 1/12) part] */
 	textlen = infolen - 3 - (2 * digits);
 
-	oprlen = mbstowcs(NULL, opr, 0);
-	/* room left (eg for package name) */
-	remainlen = textlen - oprlen - 1;
+	/* In order to deal with characters from all locales, we have to worry
+	 * about wide characters and their column widths. A lot of stuff is
+	 * done here to figure out the actual number of screen columns used
+	 * by the output, and then pad it accordingly so we fill the terminal.
+	 */
+	/* len = opr len + pkgname len (if available) + space  + null */
+	len = strlen(opr) + ((pkgname) ? strlen(pkgname) : 0) + 2;
+	wcstr = calloc(len, sizeof(wchar_t));
+	/* print our strings to the alloc'ed memory */
+	wclen = swprintf(wcstr, len, L"%s %s", opr, pkgname);
+	wcwid = wcswidth(wcstr, wclen);
+	padwid = textlen - wcwid;
+	/* if padwid is < 0, we need to trim the string so padwid = 0 */
+	if(padwid < 0) {
+		int i = textlen - 3;
+		wchar_t *p = wcstr;
+		/* grab the max number of char columns we can fill */
+		while(i > 0 && wcwidth(*p) < i) {
+			i -= wcwidth(*p);
+			p++;
+		}
+		/* then add the ellipsis and fill out any extra padding */
+		wcscpy(p, L"...");
+		padwid = i;
 
-	switch (event) {
-		case PM_TRANS_PROGRESS_ADD_START:
-		case PM_TRANS_PROGRESS_UPGRADE_START:
-		case PM_TRANS_PROGRESS_REMOVE_START:
-			printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany,
-			       opr, remainlen, remainlen, pkgname);
-			break;
-		case PM_TRANS_PROGRESS_CONFLICTS_START:
-			printf("(%*d/%*d) %s %-*s", digits, remain, digits, howmany,
-			       opr, remainlen, "");
-			break;
 	}
 
+	printf("(%*d/%*d) %ls%-*s", digits, remain, digits, howmany,
+			wcstr, padwid, "");
+
+	free(wcstr);
+
 	/* call refactored fill progress function */
 	fill_progress(percent, percent, getcols() - infolen);
 
@@ -405,7 +420,11 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 		int list_xfered, int list_total)
 {
 	const int infolen = 50;
+	const int filenamelen = infolen - 27;
 	char *fname, *p;
+	/* used for wide character width determination and printing */
+	int len, wclen, wcwid, padwid;
+	wchar_t *wcfname;
 
 	float rate = 0.0, timediff = 0.0, f_xfered = 0.0;
 	unsigned int eta_h = 0, eta_m = 0, eta_s = 0;
@@ -485,8 +504,30 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 	if((p = strstr(fname, PKGEXT)) || (p = strstr(fname, DBEXT))) {
 			*p = '\0';
 	}
-	if(strlen(fname) > FILENAME_TRIM_LEN) {
-		strcpy(fname + FILENAME_TRIM_LEN -3,"...");
+	/* In order to deal with characters from all locales, we have to worry
+	 * about wide characters and their column widths. A lot of stuff is
+	 * done here to figure out the actual number of screen columns used
+	 * by the output, and then pad it accordingly so we fill the terminal.
+	 */
+	/* len = filename len + null */
+	len = strlen(filename) + 1;
+	wcfname = calloc(len, sizeof(wchar_t));
+	wclen = mbstowcs(wcfname, fname, len);
+	wcwid = wcswidth(wcfname, wclen);
+	padwid = filenamelen - wcwid;
+	/* if padwid is < 0, we need to trim the string so padwid = 0 */
+	if(padwid < 0) {
+		int i = filenamelen - 3;
+		wchar_t *p = wcfname;
+		/* grab the max number of char columns we can fill */
+		while(i > 0 && wcwidth(*p) < i) {
+			i -= wcwidth(*p);
+			p++;
+		}
+		/* then add the ellipsis and fill out any extra padding */
+		wcscpy(p, L"...");
+		padwid = i;
+
 	}
 
 	/* Awesome formatting for progress bar.  We need a mess of Kb->Mb->Gb stuff
@@ -516,10 +557,12 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 		}
 	}
 
-	printf(" %-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname,
-				 f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s);
+	printf(" %ls%-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", wcfname,
+			padwid, "", f_xfered, xfered_size,
+			rate, rate_size, eta_h, eta_m, eta_s);
 
 	free(fname);
+	free(wcfname);
 
 	/* The progress bar is based on the file percent regardless of the
 	 * TotalDownload option. */
@@ -532,7 +575,7 @@ void cb_dl_progress(const char *filename, int file_xfered, int file_total,
 /* Callback to handle notifications from the library */
 void cb_log(pmloglevel_t level, char *fmt, va_list args)
 {
-	if(!strlen(fmt)) {
+	if(!fmt || strlen(fmt) == 0) {
 		return;
 	}
 
diff --git a/src/pacman/package.c b/src/pacman/package.c
index cc4be139..7019e7e6 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
+#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -48,6 +49,8 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	char bdatestr[50] = "", idatestr[50] = "";
 	const alpm_list_t *i;
 	alpm_list_t *requiredby = NULL, *depstrings = NULL;
+	wchar_t *wcstr;
+	int len;
 
 	if(pkg == NULL) {
 		return;
@@ -86,8 +89,6 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 		requiredby = alpm_pkg_compute_requiredby(pkg);
 	}
 
-	descheader = _("Description    : ");
-
 	/* actual output */
 	if(level == 0) {
 		string_display(_("Filename       :"), alpm_pkg_get_filename(pkg));
@@ -136,8 +137,16 @@ void dump_pkg_full(pmpkg_t *pkg, int level)
 	}
 
 	/* printed using a variable to make i18n safe */
+	descheader = _("Description    : ");
+	/* len goes from # bytes -> # chars -> # cols */
+	len = strlen(descheader) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, descheader, len);
+	len = wcswidth(wcstr, len);
+	free(wcstr);
+	/* we can finally print the darn thing */
 	printf("%s", descheader);
-	indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0));
+	indentprint(alpm_pkg_get_desc(pkg), len);
 	printf("\n\n");
 
 	/* Print additional package info if info flag passed more than once */
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 2dae832f..229f65a2 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -34,6 +34,7 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <limits.h>
+#include <wchar.h>
 
 #include <alpm.h>
 #include <alpm_list.h>
@@ -219,41 +220,54 @@ char *mdirname(const char *path)
  */
 void indentprint(const char *str, int indent)
 {
-	const char *p = str;
-	int cidx = indent;
+	wchar_t *wcstr;
+	const wchar_t *p;
+	int len, cidx;
+
+	if(!str) {
+		return;
+	}
+
+	len = strlen(str) + 1;
+	wcstr = calloc(len, sizeof(wchar_t));
+	len = mbstowcs(wcstr, str, len);
+	p = wcstr;
+	cidx = indent;
 
 	if(!p) {
 		return;
 	}
 
 	while(*p) {
-		if(*p == ' ') {
-			const char *next = NULL;
-			int len;
+		if(*p == L' ') {
+			const wchar_t *q, *next;
 			p++;
-			if(p == NULL || *p == ' ') continue;
-			next = strchr(p, ' ');
+			if(p == NULL || *p == L' ') continue;
+			next = wcschr(p, L' ');
 			if(next == NULL) {
-				next = p + mbstowcs(NULL, p, 0);
+				next = p + wcslen(p);
+			}
+			/* len captures # cols */
+			len = 0;
+			q = p;
+			while(q < next) {
+				len += wcwidth(*q++);
 			}
-			len = next - p;
 			if(len > (getcols() - cidx - 1)) {
-				/* newline */
-				int i;
-				fprintf(stdout, "\n");
-				for(i = 0; i < indent; i++) {
-					fprintf(stdout, " ");
-				}
+				/* wrap to a newline and reindent */
+				fprintf(stdout, "\n%-*s", indent, "");
 				cidx = indent;
 			} else {
 				printf(" ");
 				cidx++;
 			}
+			continue;
 		}
-		fprintf(stdout, "%c", *p);
+		fprintf(stdout, "%lc", (wint_t)*p);
+		cidx += wcwidth(*p);
 		p++;
-		cidx++;
 	}
+	free(wcstr);
 }
 
 /* Convert a string to uppercase
@@ -393,14 +407,31 @@ void list_display(const char *title, const alpm_list_t *list)
 {
 	const alpm_list_t *i;
 	int cols, len;
-
-	len = mbstowcs(NULL, title, 0);
-	printf("%s ", title);
+	wchar_t *wcstr;
+
+	if(title) {
+		/* len goes from # bytes -> # chars -> # cols */
+		len = strlen(title) + 1;
+		wcstr = calloc(len, sizeof(wchar_t));
+		len = mbstowcs(wcstr, title, len);
+		len = wcswidth(wcstr, len);
+		free(wcstr);
+		printf("%s ", title);
+	} else {
+		len = 0;
+	}
 
 	if(list) {
 		for(i = list, cols = len; i; i = alpm_list_next(i)) {
 			char *str = alpm_list_getdata(i);
-			int s = mbstowcs(NULL, str, 0) + 2;
+			/* s goes from # bytes -> # chars -> # cols */
+			int s = strlen(str) + 1;
+			wcstr = calloc(s, sizeof(wchar_t));
+			s = mbstowcs(wcstr, str, s);
+			s = wcswidth(wcstr, s);
+			free(wcstr);
+			/* two additional spaces are added to the length */
+			s += 2;
 			int maxcols = getcols();
 			if(s + cols >= maxcols) {
 				int i;
author	Dan McGee <dan@archlinux.org>	2008-02-24 08:22:07 +0100
committer	Dan McGee <dan@archlinux.org>	2008-02-24 08:22:07 +0100
commit	3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb (patch)
tree	6b968cc50ea7395b02c043022da292732196339b
parent	3a6f62d4c711d2e05821094d02d7aca290cf15f9 (diff)
parent	96f7613d15e46131bf8a4b93828ad70b041524d1 (diff)
download	pacman-3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb.tar.gz pacman-3ad3077d8d5bb0d67652d0045e3e5eaf4eef6ffb.tar.xz