Merge branch 'maint'

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

1 files changed, 2 insertions, 14 deletions

diff --git a/scripts/po/en_GB.po b/scripts/po/en_GB.po
index 558fab9e..94408f9c 100644
--- a/scripts/po/en_GB.po
+++ b/scripts/po/en_GB.po
@@ -8,8 +8,8 @@ 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: 2012-02-02 00:05-0600\n"
-"PO-Revision-Date: 2012-02-02 00:08-0600\n"
+"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"PO-Revision-Date: 2012-02-02 06:08+0000\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -755,18 +755,6 @@ msgstr "There is no secret key available to sign with."
 msgid "Use '%s' to generate a default secret key."
 msgstr "Use '%s' to generate a default secret key."
 
-msgid "Verifying %s..."
-msgstr "Verifying %s..."
-
-msgid "File %s is unsigned, cannot continue."
-msgstr "File %s is unsigned, cannot continue."
-
-msgid "The signature of file %s is not valid."
-msgstr "The signature of file %s is not valid."
-
-msgid "Verifying keyring file signatures..."
-msgstr "Verifying keyring file signatures..."
-
 msgid "No keyring files exist in %s."
 msgstr "No keyring files exist in %s."