Merge branch 'maint'

Also bump the devel version on the master branch to 3.2.0devel.

11 files changed, 145 insertions, 141 deletions

diff --git a/TRANSLATORS b/TRANSLATORS
index 5bdfdfc6..298b5434 100644
--- a/TRANSLATORS
+++ b/TRANSLATORS
@@ -10,35 +10,32 @@ If your language is not listed here and you wish it was, let the pacman mailing
 list know you are interested in making a translation. We will be happy to add
 your language to the mix.
 
-* indicates the last active translator.
-
 Czech (cs):
-	* Vojtěch Gondžala <vogo@seznam.cz>
+	Vojtěch Gondžala <vogo@seznam.cz>
 German (de):
-	* Matthias Gorissen <matthias@archlinux.de>
-	Pierre Schmitz <pierre@archlinux.de>
+	Matthias Gorissen <matthias@archlinux.de>
+	Benjamin Andresen <benny@in-ulm.de>
 British English (en_GB):
-	* Jeff Bailes <thepizzaking@gmail.com>
+	Jeff Bailes <thepizzaking@gmail.com>
 Spanish (es):
-	* Juan Pablo González Tognarelli <lord_jotape@yahoo.com.ar>
+	Fernando Lagos <fernando@zerial.org>
+	Juan Pablo Gonzalez <jotapesan@gmail.com>
 French (fr):
-	* Chantry Xavier <shiningxc@gmail.com>
-	solsTiCe d'Hiver <solstice.dhiver@laposte.net>
+	Chantry Xavier <shiningxc@gmail.com>
 Hungarian (hu):
-	* Nagy Gabor <ngaba@bibl.u-szeged.hu>
+	Nagy Gabor <ngaba@bibl.u-szeged.hu>
 Italian (it):
-	* Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
-	Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-	Lorenzo '^zanDarK' Masini <lorenxo86@gmail.com>
+	Giovanni 'voidnull' Scafora <linuxmania@gmail.com>
 Polish (pl):
-	* Mateusz Jędrasik <m.jedrasik@gmail.com>
+	Mateusz Herych <heniekk@gmail.com>
+	Jaroslaw Swierczynski <swiergot@gmail.com>
+	Mateusz Jędrasik <m.jedrasik@gmail.com>
 Brazilian Portuguese (pt_BR):
-	* João Felipe Santos <joao.eel@gmail.com>
-	Douglas Soares de Andrade <douglas@archlinux-br.org>
-	Hugo Doria <hugodoria@archlinux-br.org>
-	Lincoln de Sousa <lincoln@archlinux-br.org>
-	Leandro Inácio <leandro@archlinux-br.org>
+	João Felipe Santos <jfsantos@archlinux-br.org>
 Russian (ru):
+	Sergey Tereschenko <serg.partizan@gmail.com>
+	Vitaly Dolgov <ferhiord@gmail.com>
+	Oleg Finkelshteyn <olegfink@gmail.com>
 	Vladimir Bayrakovskiy <4rayven@gmail.com>
 Simplified Chinese (zh_CN):
 	甘露(Lu.Gan) <rhythm.gan@gmail.com>
diff --git a/configure.ac b/configure.ac
index 0b7769dc..ad051435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ m4_define([lib_revision], [0])
 m4_define([lib_age], [2])
 
 m4_define([pacman_version_major], [3])
-m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [2])
-m4_define([pacman_version_suffix], [])
+m4_define([pacman_version_minor], [2])
+m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_suffix], [devel])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 m4_define([pacman_display_version],
diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars
index 1b1b8279..d7515220 100644
--- a/lib/libalpm/po/Makevars
+++ b/lib/libalpm/po/Makevars
@@ -9,8 +9,8 @@ top_builddir = ../../../
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = \
-  --keyword=_ --flag=_:1:pass-c-format \
-  --keyword=N_ --flag=N_:1:pass-c-format
+  --keyword=_ --flag=_:1:c-format \
+  --keyword=N_ --flag=N_:1:c-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index da5e581b..27b8ce85 100644
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2008-01-14 23:08-0600\n"
-"PO-Revision-Date: 2007-04-12 04:23+0200\n"
+"PO-Revision-Date: 2008-02-25 22:16+0100\n"
 "Last-Translator: Mateusz Herych <heniekk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -154,7 +154,7 @@ msgstr "ścieżka bazy danych jest niezdefiniowana\n"
 
 #: lib/libalpm/deps.c:171
 msgid "dependency cycle detected:\n"
-msgstr "wykryto cykl zależności: %s\n"
+msgstr "wykryto cykl zależności:\n"
 
 #: lib/libalpm/deps.c:173
 #, c-format
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index aeb17d95..c33bb0fb 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -2,20 +2,20 @@
 # 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"
+"PO-Revision-Date: 2008-02-25 20:25+0100\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"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -48,7 +48,8 @@ msgstr "你可以使用 -Rd 及 -U 来手动替代软件包\n"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr "目录权限不一致%s\n"
+msgstr ""
+"目录权限不一致%s\n"
 "文件系统：%o  软件包：%o\n"
 
 #: lib/libalpm/add.c:404
@@ -493,8 +494,8 @@ 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"
+msgid "%s: ignoring package upgrade (%s => %s)\n"
+msgstr "%s：忽略软件包更新（%s => %s）\n"
 
 #: lib/libalpm/sync.c:309
 #, c-format
@@ -652,4 +653,3 @@ msgstr "md5：%s无法打开\n"
 #, c-format
 msgid "md5: %s can't be read\n"
 msgstr "md5：%s无法读取\n"
-
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index f6097420..8d3e04c4 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -150,7 +150,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 						sync->removes = alpm_list_add(NULL, lpkg);
 						*syncpkgs = alpm_list_add(*syncpkgs, sync);
 					}
-					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)\n",
+					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n",
 							alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
 							alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				}
diff --git a/po/Makevars b/po/Makevars
index 94d8294a..38a4692e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -9,8 +9,8 @@ top_builddir = ../
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = \
-  --keyword=_ --flag=_:1:pass-c-format \
-  --keyword=N_ --flag=N_:1:pass-c-format
+  --keyword=_ --flag=_:1:c-format \
+  --keyword=N_ --flag=N_:1:c-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.
diff --git a/po/es.po b/po/es.po
index e2ae8f05..04d3a5d5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: es\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-19 12:30-0300\n"
+"PO-Revision-Date: 2008-02-25 22:16+0100\n"
 "Last-Translator: Fernando Lagos <fernando@zerial.org>\n"
 "Language-Team:  <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -345,7 +345,7 @@ msgstr "No"
 
 #: src/pacman/package.c:135
 msgid "MD5 Sum        :"
-msgstr "Hash MD5     : %s"
+msgstr "Hash MD5     :"
 
 #: src/pacman/package.c:159
 msgid "Repository     :"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95d7cf38..4bb5b34f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,19 +2,19 @@
 # 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"
+"PO-Revision-Date: 2008-02-25 16:04+0100\n"
+"Last-Translator: 甘露（Gan Lu） <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"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: src/pacman/add.c:40 src/pacman/remove.c:42
 #, c-format
@@ -36,7 +36,8 @@ msgstr "错误： %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s.\n"
-msgstr "  如果你确认软件包管理器已经没有\n"
+msgstr ""
+"  如果你确认软件包管理器已经没有\n"
 "  运行，你可以删除 %s。\n"
 
 #: src/pacman/add.c:114 src/pacman/remove.c:106
@@ -85,7 +86,8 @@ msgstr "%s: 文件系统中已存在 %s \n"
 msgid ""
 "\n"
 "errors occurred, no packages were upgraded.\n"
-msgstr "\n"
+msgstr ""
+"\n"
 "发生错误，没有软件包进行更新\n"
 
 #: src/pacman/add.c:184 src/pacman/remove.c:168 src/pacman/sync.c:706
@@ -168,7 +170,9 @@ msgstr ":: 正在从 %s获取软件包……\n"
 msgid ""
 ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
 "n] "
-msgstr ":: %s需要安装列在IgnorePkg/IgnoreGroup（忽略清单）中的%s。无论如何都进行安装吗?[Y/n]"
+msgstr ""
+":: %s需要安装列在IgnorePkg/IgnoreGroup（忽略清单）中的%s。无论如何都进行安装"
+"吗?[Y/n]"
 
 #: src/pacman/callback.c:270
 #, c-format
@@ -223,7 +227,7 @@ msgstr "正在检查文件冲突"
 
 #: src/pacman/package.c:68
 msgid "Explicitly installed"
-msgstr "已指定安装"
+msgstr "单独指定安装"
 
 #: src/pacman/package.c:71
 msgid "Installed as a dependency for another package"
@@ -235,94 +239,94 @@ msgstr "未知的"
 
 #: src/pacman/package.c:89
 msgid "Description    : "
-msgstr "描述："
+msgstr "描述　　　： "
 
 #: src/pacman/package.c:93
 msgid "Filename       :"
-msgstr "文件名："
+msgstr "文件名　　："
 
 #: src/pacman/package.c:95
 msgid "Name           :"
-msgstr "名称："
+msgstr "名称　　　："
 
 #: src/pacman/package.c:96
 msgid "Version        :"
-msgstr "版本："
+msgstr "版本　　　："
 
 #: src/pacman/package.c:97
 msgid "URL            :"
-msgstr "URL："
+msgstr "ＵＲＬ　　："
 
 #: src/pacman/package.c:98
 msgid "Licenses       :"
-msgstr "版权声明："
+msgstr "软件许可　："
 
 #: src/pacman/package.c:99
 msgid "Groups         :"
-msgstr "软件组："
+msgstr "软件组　　："
 
 #: src/pacman/package.c:100
 msgid "Provides       :"
-msgstr "提供:"
+msgstr "提供　　　："
 
 #: src/pacman/package.c:101
 msgid "Depends On     :"
-msgstr "倚赖于："
+msgstr "倚赖于　　："
 
 #: src/pacman/package.c:102
 msgid "Optional Deps  :"
-msgstr "可选倚赖："
+msgstr "可选倚赖　："
 
 #: src/pacman/package.c:105
 msgid "Required By    :"
-msgstr "要求被："
+msgstr "要求被　　："
 
 #: src/pacman/package.c:108
 msgid "Conflicts With :"
-msgstr "冲突与："
+msgstr "冲突与　　："
 
 #: src/pacman/package.c:109
 msgid "Replaces       :"
-msgstr "取代："
+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
 msgid "Compressed Size: %6.2f K\n"
-msgstr "压缩后大小：%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"
+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"
@@ -334,11 +338,11 @@ msgstr "否"
 
 #: src/pacman/package.c:135
 msgid "MD5 Sum        :"
-msgstr "MD5值："
+msgstr "ＭＤ５值　："
 
 #: src/pacman/package.c:159
 msgid "Repository     :"
-msgstr "软件库："
+msgstr "软件仓库　："
 
 #: src/pacman/package.c:169
 #, c-format
@@ -407,7 +411,7 @@ msgstr ""
 #: 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"
+msgstr "      --asdeps         作为非单独指定安装的软件包安装\n"
 
 #: src/pacman/pacman.c:82 src/pacman/pacman.c:88 src/pacman/pacman.c:96
 #: src/pacman/pacman.c:119
@@ -456,7 +460,7 @@ msgstr "  -d, --deps           列出所有作为倚赖关系安装的软件包\
 #: src/pacman/pacman.c:103
 #, c-format
 msgid "  -e, --explicit       list all packages explicitly installed\n"
-msgstr "  -e, --explicit       列出所有指定安装的软件包\n"
+msgstr "  -e, --explicit       列出所有单独指定安装的软件包\n"
 
 #: src/pacman/pacman.c:104 src/pacman/pacman.c:122
 #, c-format
@@ -532,7 +536,7 @@ 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"
+msgstr "  -l, --list <软件仓库>    查看在该软件仓库中的软件包清单\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
@@ -545,7 +549,7 @@ msgstr "  -p, --print-uris     打印指定软件包及依赖关系中的URI\n"
 #, c-format
 msgid ""
 "  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr "  -s, --search <regex表达式> 按照指定字符串查找远端软件库\n"
+msgstr "  -s, --search <regex表达式> 按照指定字符串查询远端软件仓库\n"
 
 #: src/pacman/pacman.c:127
 #, c-format
@@ -583,8 +587,9 @@ msgstr "      --ignore <软件包>   升级时忽略某个软件包（可多次�
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr "      --ignoregroup <软件包组>\n  "
-"                       升级时忽略某个软件包组（可多次使用）\n"
+msgstr ""
+"      --ignoregroup <软件包组>\n"
+"                         升级时忽略某个软件包组（可多次使用）\n"
 
 #: src/pacman/pacman.c:134
 #, c-format
@@ -643,7 +648,8 @@ msgstr "      --cachedir <目录> 指定另外的软件包缓存位置\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License\n"
-msgstr "                       本程序可以按照GNU条款\n"
+msgstr ""
+"                       本程序可以按照GNU条款\n"
 "                       自由分发\n"
 
 #: src/pacman/pacman.c:247
@@ -664,7 +670,7 @@ msgstr "设置日志文件'%s' (%s)时出现问题\n"
 #: src/pacman/pacman.c:382
 #, c-format
 msgid "'%s' is not a valid debug level\n"
-msgstr "'%s' 是一个无效的debug水平\n"
+msgstr "'%s' 是一个无效的debug标准\n"
 
 #: src/pacman/pacman.c:396 src/pacman/pacman.c:672
 #, c-format
@@ -799,7 +805,8 @@ msgstr "目标："
 msgid ""
 "\n"
 "Do you want to remove these packages? [Y/n] "
-msgstr "\n"
+msgstr ""
+"\n"
 "打算删除这些软件包吗？ [Y/n] "
 
 #: src/pacman/sync.c:52
@@ -815,7 +822,7 @@ msgstr "打算删除%s？[Y/n]"
 #: src/pacman/sync.c:89
 #, c-format
 msgid "error: could not remove repository directory\n"
-msgstr "错误：无法删除软件库目录\n"
+msgstr "错误：无法删除软件仓库目录\n"
 
 #: src/pacman/sync.c:102
 #, c-format
@@ -824,7 +831,7 @@ msgstr "数据库目录：%s\n"
 
 #: src/pacman/sync.c:103
 msgid "Do you want to remove unused repositories? [Y/n] "
-msgstr "打算删除无用的软件库？[Y/n]"
+msgstr "打算删除无用的软件仓库？[Y/n]"
 
 #: src/pacman/sync.c:114
 #, c-format
@@ -887,7 +894,7 @@ msgstr " %s 已经是最新版本\n"
 #: src/pacman/sync.c:368
 #, c-format
 msgid "error: repository '%s' does not exist\n"
-msgstr "错误：软件库'%s'不存在\n"
+msgstr "错误：软件仓库'%s'不存在\n"
 
 #: src/pacman/sync.c:383
 #, c-format
@@ -902,7 +909,7 @@ msgstr "错误：软件包'%s'没有找到\n"
 #: src/pacman/sync.c:440
 #, c-format
 msgid "error: repository \"%s\" was not found.\n"
-msgstr "错误：软件库\"%s\"没有找到\n"
+msgstr "错误：软件仓库\"%s\"没有找到\n"
 
 #: src/pacman/sync.c:492
 #, c-format
@@ -1070,24 +1077,26 @@ msgstr "用法：%s <root> <destfile> [软件包目录]"
 msgid ""
 "NOTE: this script is DEPRECATED. It will be removed in the next major"
 "\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
-msgstr "注意：该脚本标注为“放弃”，将在pacman的下一个"
-"\\n主要版本中删除，请使用repo-add和repo-remove。\\n\\n"
+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"
+msgstr ""
+"gensync会通过读取<root>目录下所有的PKGBUILD来生成一个同步数据库。\\ngensync会"
+"在一个临时目录中创建该数据库\\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"
+msgstr ""
+"gensync会为在<destfile>同目录下的所有软件包计算md5值\\n除非另外指定了其他的"
+"［软件包_目录］。\\n\\n"
 
 #: scripts/gensync.sh.in:43
 msgid ""
@@ -1096,11 +1105,11 @@ msgid ""
 "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"
-""
+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"
@@ -1112,9 +1121,9 @@ 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"
+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."
@@ -1351,7 +1360,7 @@ msgstr "正在生成.PKGINFO文件……"
 
 #: scripts/makepkg.sh.in:846
 msgid "Please add a license line to your %s!"
-msgstr "请添加版权声明行到你的%s！"
+msgstr "请添加软件许可行到你的%s！"
 
 #: scripts/makepkg.sh.in:847
 msgid "Example for GPL'ed software: license=('GPL')."
@@ -1549,8 +1558,7 @@ msgstr "这些选项可以传递给pacman："
 msgid ""
 "      --noconfirm      Do not ask for confirmation when resolving "
 "dependencies"
-msgstr ""
-"      --noconfirm      当解决依赖关系时不询问确认"
+msgstr "      --noconfirm      当解决依赖关系时不询问确认"
 
 #: scripts/makepkg.sh.in:1099
 msgid ""
@@ -1782,8 +1790,9 @@ msgstr "用法：%s [pacman_db_root]"
 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"
+msgstr ""
+"pacman-optimize 是一个小hack，它可以提高pacman\\n读取/写入它基于文件系统的数"
+"据库时的表现\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:46
 msgid ""
@@ -1793,11 +1802,10 @@ msgid ""
 "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"
+msgstr ""
+"因为pacman使用许多小文件来记录软件包。\\n久而久之这些文件有倾向变得零碎。\\n"
+"这个脚本尝试把这些小文件重新放置到你硬盘上的一个连续的位置。\\n结果是硬盘由于"
+"不用再在碟片上移来移去，从而可以读取得更快。\\n"
 
 #: scripts/pacman-optimize.sh.in:89
 msgid "diff tool was not found, please install diffutils."
@@ -1867,17 +1875,18 @@ msgstr "用法：%s <path-to-db> [--force] <package> ...\\n\\n"
 msgid ""
 "repo-add will update a package database by reading a package file."
 "\\nMultiple packages to add can be specified on the command line.\\n\\n"
-msgstr "repo-add通过读取一个软件包文件来更新软件包数据库。"
-"\\n可以在命令行中指定添加多个软件包\\n\\n"
+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"
+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"
@@ -1888,9 +1897,9 @@ 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"
+msgstr ""
+"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\n这是一个免费软"
+"件；版权条款见源码。\\n不提供任何法律所规定的保证\\n"
 
 #: scripts/repo-add.sh.in:174
 msgid "Invalid package file '%s'."
@@ -1977,9 +1986,9 @@ 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"
+msgstr ""
+"repo-remove通过从给定的库数据库中删除\\n在命令行中指定的软件包名来更新某个软"
+"件包数据库。\\n可在命令行中指定同时删除多个软件包。\\n\\n"
 
 #: scripts/repo-remove.sh.in:58
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
@@ -2010,9 +2019,9 @@ 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"
+msgstr ""
+"updatesync 将通过读取某个PKGBUILD或修改destfile来更新\\n一个同步数据库。"
+"updatesync 先在一个临时目录中更新数据库，\\n然后在压缩到<destfile>.\\n\\n"
 
 #: scripts/updatesync.sh.in:41
 msgid "There are two types of actions:\\n\\n"
@@ -2022,22 +2031,25 @@ msgstr "有两种行为：\\n\\n"
 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"
+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"
+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"
+msgstr ""
+"updatesync将计算同一目录下的软件包md5值\\n作为<destfile>，除非指定了另外的[软"
+"件包e_目录]\\n\\n"
 
 #: scripts/updatesync.sh.in:48
 msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
@@ -2048,9 +2060,9 @@ 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"
+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"
@@ -2059,4 +2071,3 @@ 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/add.c b/src/pacman/add.c
index 9d646e11..fd40f005 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -111,18 +111,16 @@ int pacman_add(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = targets; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			printf(_("failed.\n"));
 			fprintf(stderr, _("error: '%s': %s\n"),
 					targ, alpm_strerrorlast());
 			add_cleanup();
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: "compute" the transaction based on targets and flags */
 	/* TODO: No, compute nothing. This is stupid. */
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index a604014e..2fb69d35 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -103,11 +103,10 @@ int pacman_remove(alpm_list_t *targets)
 	}
 
 	/* add targets to the created transaction */
-	printf(_("loading package data... "));
+	printf(_("loading package data...\n"));
 	for(i = finaltargs; i; i = alpm_list_next(i)) {
 		char *targ = alpm_list_getdata(i);
 		if(alpm_trans_addtarget(targ) == -1) {
-			printf(_("failed.\n"));
 			fprintf(stderr, _("error: '%s': %s\n"),
 					targ, alpm_strerrorlast());
 			remove_cleanup();
@@ -115,7 +114,6 @@ int pacman_remove(alpm_list_t *targets)
 			return(1);
 		}
 	}
-	printf(_("done.\n"));
 
 	/* Step 2: prepare the transaction based on its type, targets and flags */
 	if(alpm_trans_prepare(&data) == -1) {