Merge branch 'maint'

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

1 files changed, 2 insertions, 14 deletions

diff --git a/scripts/po/pacman-scripts.pot b/scripts/po/pacman-scripts.pot
index 0e08bb4c..72772047 100644
--- a/scripts/po/pacman-scripts.pot
+++ b/scripts/po/pacman-scripts.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 4.0.1\n"
+"Project-Id-Version: pacman 4.0.2\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-02-02 00:05-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\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"
@@ -715,18 +715,6 @@ msgstr ""
 msgid "Use '%s' to generate a default secret key."
 msgstr ""
 
-msgid "Verifying %s..."
-msgstr ""
-
-msgid "File %s is unsigned, cannot continue."
-msgstr ""
-
-msgid "The signature of file %s is not valid."
-msgstr ""
-
-msgid "Verifying keyring file signatures..."
-msgstr ""
-
 msgid "No keyring files exist in %s."
 msgstr ""