Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index d5439d54..928b4513 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,7 @@ 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-01-05 16:57-0600\n"
 "PO-Revision-Date: 2011-11-14 09:22+0000\n"
 "Last-Translator: hseara <hseara@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/"
@@ -1082,12 +1082,16 @@ msgstr "«%s» no té una extensió d'arxiu vàlida."
 msgid "An entry for '%s' already existed"
 msgstr "Ja existeix una entrada per '%s'"
 
-msgid "Computing checksums..."
-msgstr "Calculant sumes de comprovació"
+#, fuzzy
+msgid "Invalid package signature file '%s'."
+msgstr "Fitxer de paquet invàlid '%'."
 
 msgid "Adding package signature..."
 msgstr "Afegint signatura al paquet..."
 
+msgid "Computing checksums..."
+msgstr "Calculant sumes de comprovació"
+
 msgid "Creating '%s' db entry..."
 msgstr "Creant entrada base de dades '%s'..."