Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c
	lib/libalpm/sync.c

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/libalpm/po/zh_TW.po b/lib/libalpm/po/zh_TW.po
index 30a3af8a..059d12c6 100644
--- a/lib/libalpm/po/zh_TW.po
+++ b/lib/libalpm/po/zh_TW.po
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-11-13 21:47-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
 "PO-Revision-Date: 2011-10-06 03:39+0000\n"
-"Last-Translator: toofishes <dpmcgee@gmail.com>\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/zh_TW/)\n"
+"archlinux-pacman/language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"