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, 12 insertions, 4 deletions

diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 34106630..fed05bb6 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-07-27 21:15-0500\n"
+"POT-Creation-Date: 2009-09-17 02:04+0200\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"
@@ -21,11 +21,11 @@ msgid "replacing older version %s-%s by %s in target list\n"
 msgstr ""
 
 #, c-format
-msgid "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 ""
 
 #, c-format
-msgid "conflicting packages were found in the target list\n"
+msgid "conflicting packages were found in target list\n"
 msgstr ""
 
 #, c-format
@@ -99,6 +99,10 @@ msgid "could not add entry '%s' in cache\n"
 msgstr ""
 
 #, c-format
+msgid "removing invalid database: %s\n"
+msgstr ""
+
+#, c-format
 msgid "could not remove database %s\n"
 msgstr ""
 
@@ -391,6 +395,10 @@ msgid "could not find %s in database -- skipping\n"
 msgstr ""
 
 #, c-format
+msgid "removing %s from target list\n"
+msgstr ""
+
+#, c-format
 msgid "cannot remove file '%s': %s\n"
 msgstr ""
 
@@ -519,7 +527,7 @@ msgid "could not change directory to / (%s)\n"
 msgstr ""
 
 #, c-format
-msgid "call to popen failed (%s)"
+msgid "call to popen failed (%s)\n"
 msgstr ""
 
 #, c-format