Merge branch 'maint'

Conflicts:
	lib/libalpm/signing.c

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

1 files changed, 5 insertions, 2 deletions

diff --git a/scripts/po/pacman-scripts.pot b/scripts/po/pacman-scripts.pot
index 6b15b853..aebf299f 100644
--- a/scripts/po/pacman-scripts.pot
+++ b/scripts/po/pacman-scripts.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pacman 4.0.1\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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -958,12 +958,15 @@ msgstr ""
 msgid "An entry for '%s' already existed"
 msgstr ""
 
-msgid "Computing checksums..."
+msgid "Invalid package signature file '%s'."
 msgstr ""
 
 msgid "Adding package signature..."
 msgstr ""
 
+msgid "Computing checksums..."
+msgstr ""
+
 msgid "Creating '%s' db entry..."
 msgstr ""