Merge branch 'maint'

Message updates made this one a bit messy, but nothing too bad.

Conflicts:
	lib/libalpm/add.c
	lib/libalpm/remove.c

1 files changed, 17 insertions, 9 deletions

diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index 8e1c56fd..2237eb37 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
-"PO-Revision-Date: 2009-07-30 18:37+1000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\n"
+"PO-Revision-Date: 2009-09-16 19:39-0600\n"
+"Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +21,12 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr "replacing older version %s-%s by %s in target list\n"
 
 #, c-format
-msgid "skipping %s-%s because newer version %s is in the target list\n"
-msgstr "skipping %s-%s because newer version %s is in the target list\n"
+msgid "skipping %s-%s because newer version %s is in target list\n"
+msgstr "skipping %s-%s because newer version %s is in target list\n"
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
-msgstr "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
+msgstr "conflicting packages were found in target list\n"
 
 #, c-format
 msgid "you cannot install two conflicting packages at the same time\n"
@@ -101,6 +101,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr "could not add entry '%s' in cache\n"
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr "removing invalid database: %s\n"
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr "could not remove database %s\n"
 
@@ -393,6 +397,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr "could not find %s in database -- skipping\n"
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr "removing %s from target list\n"
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr "cannot remove file '%s': %s\n"
 
@@ -521,8 +529,8 @@ msgid "could not change directory to / (%s)\n"
 msgstr "could not change directory to / (%s)\n"
 
 #, c-format
-msgid "call to popen failed (%s)"
-msgstr "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
+msgstr "call to popen failed (%s)\n"
 
 #, c-format
 msgid "call to waitpid failed (%s)\n"