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, 27 insertions, 11 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index fef77b31..f3d794d6 100644
--- a/po/en_GB.po
+++ b/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-28 07:00-0500\n"
-"PO-Revision-Date: 2009-07-30 18:36+1000\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
+"POT-Creation-Date: 2009-09-17 02:29+0200\n"
+"PO-Revision-Date: 2009-09-16 19:42-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"
@@ -456,11 +456,9 @@ msgstr ""
 
 #, c-format
 msgid ""
-"  -u, --sysupgrade     upgrade all outdated packages (-uu enables "
-"downgrade)\n"
+"  -u, --sysupgrade     upgrade installed packages (-uu allows downgrade)\n"
 msgstr ""
-"  -u, --sysupgrade     upgrade all outdated packages (-uu enables "
-"downgrade)\n"
+"  -u, --sysupgrade     upgrade installed packages (-uu allows downgrade)\n"
 
 #, c-format
 msgid ""
@@ -573,6 +571,14 @@ msgid "only one operation may be used at a time\n"
 msgstr "only one operation may be used at a time\n"
 
 #, c-format
+msgid "could not chdir to download directory %s\n"
+msgstr "could not chdir to download directory %s\n"
+
+#, c-format
+msgid "running XferCommand: fork failed!\n"
+msgstr "running XferCommand: fork failed!\n"
+
+#, c-format
 msgid "config file %s could not be read.\n"
 msgstr "config file %s could not be read.\n"
 
@@ -657,6 +663,10 @@ msgid "file path too long\n"
 msgstr "file path too long\n"
 
 #, c-format
+msgid "%s: %d total files, %d missing file(s)\n"
+msgstr "%s: %d total files, %d missing file(s)\n"
+
+#, c-format
 msgid "no usable package repositories configured.\n"
 msgstr "no usable package repositories configured.\n"
 
@@ -841,8 +851,8 @@ msgid " local database is up to date\n"
 msgstr " local database is up to date\n"
 
 #, c-format
-msgid "no database for package: %s\n"
-msgstr "no database for package: %s\n"
+msgid "no URL for package: %s\n"
+msgstr "no URL for package: %s\n"
 
 #, c-format
 msgid "Proceed with download?"
@@ -1088,6 +1098,9 @@ msgstr "Extracting Sources..."
 msgid "Unable to find source file %s for extraction."
 msgstr "Unable to find source file %s for extraction."
 
+msgid "Extracting %s with %s"
+msgstr "Extracting %s with %s"
+
 msgid "Failed to extract %s"
 msgstr "Failed to extract %s"
 
@@ -1262,6 +1275,9 @@ msgstr "  -f, --force      Overwrite existing package"
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Generate integrity checks for source files"
 
+msgid "      --skipinteg  Do not fail when integrity checks are missing"
+msgstr "      --skipinteg  Do not fail when integrity checks are missing"
+
 msgid "  -h, --help       This help"
 msgstr "  -h, --help       This help"
 
@@ -1627,8 +1643,8 @@ msgstr "Creating 'depends' db entry..."
 msgid "Failed to acquire lockfile: %s."
 msgstr "Failed to acquire lockfile: %s."
 
-msgid "Held by %s"
-msgstr "Held by %s"
+msgid "Held by process %s"
+msgstr "Held by process %s"
 
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Repository file '%s' is not a proper pacman database."