Merge branch 'maint'

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

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 2f12f268..677a6f1a 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -5,17 +5,18 @@
 # Translators:
 # ambaratti <ambaratti.listas@gmail.com>, 2011.
 # Dan McGee <dpmcgee@gmail.com>, 2011.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012.
 # Rafael  <rafael.f.f1@gmail.com>, 2011.
 # Sandro  <sandrossv@hotmail.com>, 2011.
 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"
-"PO-Revision-Date: 2011-10-06 03:50+0000\n"
-"Last-Translator: rafaelff1 <rafael.f.f1@gmail.com>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
-"archlinux-pacman/team/pt_BR/)\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"PO-Revision-Date: 2012-02-27 22:06+0000\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
+"archlinux-pacman/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"