Merge branch 'maint'

1 files changed, 4 insertions, 89 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 15644404..3114bade 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-09-17 02:29+0200\n"
-"PO-Revision-Date: 2009-09-16 19:42-0600\n"
+"POT-Creation-Date: 2009-10-04 16:48+0200\n"
+"PO-Revision-Date: 2009-10-04 17:07+0200\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1703,93 +1703,8 @@ msgstr "Creating updated database file '%s'"
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' does not have a valid archive extension."
 
-msgid "All packages have been removed from the database. Deleting '%s'."
-msgstr "All packages have been removed from the database. Deleting '%s'."
+msgid "No packages remain, creating empty database."
+msgstr "No packages modified, nothing to do."
 
 msgid "No packages modified, nothing to do."
 msgstr "No packages modified, nothing to do."
-
-#~ msgid ""
-#~ ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
-#~ msgstr ""
-#~ ":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
-
-#~ msgid "Checking for package upgrades... \n"
-#~ msgstr "Checking for package upgrades... \n"
-
-#~ msgid "no upgrades found.\n"
-#~ msgstr "no upgrades found.\n"
-
-#~ msgid "done.\n"
-#~ msgstr "done.\n"
-
-#~ msgid "Invalid integrity algorithm '%s' specified"
-#~ msgstr "Invalid integrity algorithm '%s' specified"
-
-#~ msgid "Making delta from version %s..."
-#~ msgstr "Making delta from version %s..."
-
-#~ msgid "Recreating package tarball from delta to match md5 signatures"
-#~ msgstr "Recreating package tarball from delta to match md5 signatures"
-
-#~ msgid "NOTE: the delta should ONLY be distributed with this tarball"
-#~ msgstr "NOTE: the delta should ONLY be distributed with this tarball"
-
-#~ msgid "Could not generate the package from the delta."
-#~ msgstr "Could not generate the package from the delta."
-
-#~ msgid "Delta was not able to be created."
-#~ msgstr "Delta was not able to be created."
-
-#~ msgid "No previous version found, skipping xdelta."
-#~ msgstr "No previous version found, skipping xdelta."
-
-#~ msgid ""
-#~ "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-#~ "free software; see the source for copying conditions.\\nThere is NO "
-#~ "WARRANTY, to the extent permitted by law.\\n"
-#~ msgstr ""
-#~ "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-#~ "free software; see the source for copying conditions.\\nThere is NO "
-#~ "WARRANTY, to the extent permitted by law.\\n"
-
-#~ msgid "BUILDSCRIPT is undefined! Ensure you have updated %s."
-#~ msgstr "BUILDSCRIPT is undefined! Ensure you have updated %s."
-
-#~ msgid "Skipping build."
-#~ msgstr "Skipping build."
-
-#~ msgid "Running makepkg as root..."
-#~ msgstr "Running makepkg as root..."
-
-#~ msgid ""
-#~ "The -q/--quiet flag to either program will force silent running except"
-#~ "\\nin the case of warnings or errors.\\n\\n"
-#~ msgstr ""
-#~ "The -q/--quiet flag to either program will force silent running except"
-#~ "\\nin the case of warnings or errors.\\n\\n"
-
-#~ msgid "Could not add delta '%s'"
-#~ msgstr "Could not add delta '%s'"
-
-#~ msgid "Either realpath or readlink are required by repo-add."
-#~ msgstr "Either realpath or readlink are required by repo-add."
-
-#~ msgid "%s not found. Cannot continue."
-#~ msgstr "%s not found. Cannot continue."
-
-#~ msgid "No compression set."
-#~ msgstr "No compression set."
-
-#~ msgid "segmentation fault\n"
-#~ msgstr "segmentation fault\n"
-
-#~ msgid ""
-#~ "Internal pacman error: Segmentation fault.\n"
-#~ "Please submit a full bug report with --debug if appropriate.\n"
-#~ msgstr ""
-#~ "Internal pacman error: Segmentation fault.\n"
-#~ "Please submit a full bug report with --debug if appropriate.\n"
-
-#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
-#~ msgstr "For full benefits of pacman-optimize, run 'sync' now."