Update British English translation

Signed-off-by: Xavier Chantry <shiningxc@gmail.com>

1 files changed, 293 insertions, 440 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 9512fd84..09c0389a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-03-03 20:03-0600\n"
-"PO-Revision-Date: 2008-03-03 21:07+0100\n"
+"POT-Creation-Date: 2008-07-19 16:35+0200\n"
+"PO-Revision-Date: 2008-07-19 17:31+0200\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,66 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, c-format
-msgid "failed to release transaction (%s)\n"
-msgstr "failed to release transaction (%s)\n"
-
-#, c-format
-msgid "no targets specified (use -h for help)\n"
-msgstr "no targets specified (use -h for help)\n"
-
-#, c-format
-msgid "error: %s\n"
-msgstr "error: %s\n"
-
-#, c-format
-msgid ""
-"  if you're sure a package manager is not already\n"
-"  running, you can remove %s.\n"
-msgstr ""
-"  if you're sure a package manager is not already\n"
-"  running, you can remove %s.\n"
-
-#, c-format
-msgid "loading package data...\n"
-msgstr "loading package data...\n"
-
-#, c-format
-msgid "error: '%s': %s\n"
-msgstr "error: '%s': %s\n"
-
-#, c-format
-msgid "error: failed to prepare transaction (%s)\n"
-msgstr "error: failed to prepare transaction (%s)\n"
-
-#, c-format
-msgid ":: %s: requires %s\n"
-msgstr ":: %s: requires %s\n"
-
-#, c-format
-msgid ":: %s: conflicts with %s\n"
-msgstr ":: %s: conflicts with %s\n"
-
-#, c-format
-msgid "%s exists in both '%s' and '%s'\n"
-msgstr "%s exists in both '%s' and '%s'\n"
-
-#, c-format
-msgid "%s: %s exists in filesystem\n"
-msgstr "%s: %s exists in filesystem\n"
-
-#, c-format
-msgid ""
-"\n"
-"errors occurred, no packages were upgraded.\n"
-msgstr ""
-"\n"
-"errors occurred, no packages were upgraded.\n"
-
-#, c-format
-msgid "error: failed to commit transaction (%s)\n"
-msgstr "error: failed to commit transaction (%s)\n"
-
-#, c-format
 msgid "checking dependencies...\n"
 msgstr "checking dependencies...\n"
 
@@ -134,39 +74,33 @@ msgstr ":: Retrieving packages from %s...\n"
 
 #, c-format
 msgid ""
-":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
-"n] "
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
 msgstr ""
-":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway? [Y/"
-"n] "
+":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"
 
 #, c-format
-msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
-msgstr ":: %s is in IgnorePkg/IgnoreGroup. Install anyway? [Y/n] "
+msgid ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
+msgstr ":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"
 
 #, c-format
-msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
-msgstr ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "
+msgid ":: %s is designated as a HoldPkg. Remove anyway?"
+msgstr ":: %s is designated as a HoldPkg. Remove anyway?"
 
 #, c-format
-msgid ":: Replace %s with %s/%s? [Y/n] "
-msgstr ":: Replace %s with %s/%s? [Y/n] "
+msgid ":: Replace %s with %s/%s?"
+msgstr ":: Replace %s with %s/%s?"
 
 #, c-format
-msgid "Replacing %s with %s/%s\n"
-msgstr "Replacing %s with %s/%s\n"
+msgid ":: %s conflicts with %s. Remove %s?"
+msgstr ":: %s conflicts with %s. Remove %s?"
 
 #, c-format
-msgid ":: %s conflicts with %s. Remove %s? [Y/n] "
-msgstr ":: %s conflicts with %s. Remove %s? [Y/n] "
+msgid ":: %s-%s: local version is newer. Upgrade anyway?"
+msgstr ":: %s-%s: local version is newer. Upgrade anyway?"
 
 #, c-format
-msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-msgstr ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "
-
-#, c-format
-msgid ":: File %s is corrupted. Do you want to delete it? [Y/n] "
-msgstr ":: File %s is corrupted. Do you want to delete it? [Y/n] "
+msgid ":: File %s is corrupted. Do you want to delete it?"
+msgstr ":: File %s is corrupted. Do you want to delete it?"
 
 #, c-format
 msgid "installing"
@@ -185,6 +119,10 @@ msgid "checking for file conflicts"
 msgstr "checking for file conflicts"
 
 #, c-format
+msgid "malloc failure: could not allocate %zd bytes\n"
+msgstr "malloc failure: could not allocate %zd bytes\n"
+
+#, c-format
 msgid "Explicitly installed"
 msgstr "Explicitly installed"
 
@@ -197,10 +135,6 @@ msgid "Unknown"
 msgstr "Unknown"
 
 #, c-format
-msgid "Filename       :"
-msgstr "Filename       :"
-
-#, c-format
 msgid "Name           :"
 msgstr "Name           :"
 
@@ -305,8 +239,8 @@ msgid "Backup Files:\n"
 msgstr "Backup Files:\n"
 
 #, c-format
-msgid "error: could not calculate checksums for %s\n"
-msgstr "error: could not calculate checksums for %s\n"
+msgid "could not calculate checksums for %s\n"
+msgstr "could not calculate checksums for %s\n"
 
 #, c-format
 msgid "MODIFIED\t%s\n"
@@ -325,8 +259,8 @@ msgid "(none)\n"
 msgstr "(none)\n"
 
 #, c-format
-msgid "error: no changelog available for '%s'.\n"
-msgstr "error: no changelog available for '%s'.\n"
+msgid "no changelog available for '%s'.\n"
+msgstr "no changelog available for '%s'.\n"
 
 #, c-format
 msgid "options"
@@ -357,24 +291,16 @@ msgstr ""
 "use '%s --help' with other options for more syntax\n"
 
 #, c-format
-msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr "      --asdeps         install packages as non-explicitly installed\n"
-
-#, c-format
-msgid "  -d, --nodeps         skip dependency checks\n"
-msgstr "  -d, --nodeps         skip dependency checks\n"
-
-#, c-format
-msgid "  -f, --force          force install, overwrite conflicting files\n"
-msgstr "  -f, --force          force install, overwrite conflicting files\n"
-
-#, c-format
 msgid ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
 msgstr ""
 "  -c, --cascade        remove packages and all packages that depend on them\n"
 
 #, c-format
+msgid "  -d, --nodeps         skip dependency checks\n"
+msgstr "  -d, --nodeps         skip dependency checks\n"
+
+#, c-format
 msgid ""
 "  -k, --dbonly         only remove database entry, do not remove files\n"
 msgstr ""
@@ -387,8 +313,28 @@ msgstr "  -n, --nosave         remove configuration files as well\n"
 #, c-format
 msgid ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
+"                       (-ss includes explicitly installed dependencies too)\n"
 msgstr ""
 "  -s, --recursive      remove dependencies also (that won't break packages)\n"
+"                       (-ss includes explicitly installed dependencies too)\n"
+
+#, c-format
+msgid ""
+"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+msgstr ""
+"  -u, --unneeded       remove unneeded packages (that won't break packages)\n"
+
+#, c-format
+msgid "      --asdeps         install packages as non-explicitly installed\n"
+msgstr "      --asdeps         install packages as non-explicitly installed\n"
+
+#, c-format
+msgid "      --asexplicit     install packages as explicitly installed\n"
+msgstr "      --asexplicit     install packages as explicitly installed\n"
+
+#, c-format
+msgid "  -f, --force          force install, overwrite conflicting files\n"
+msgstr "  -f, --force          force install, overwrite conflicting files\n"
 
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
@@ -460,10 +406,6 @@ msgstr ""
 "all)\n"
 
 #, c-format
-msgid "  -e, --dependsonly    install dependencies only\n"
-msgstr "  -e, --dependsonly    install dependencies only\n"
-
-#, c-format
 msgid "  -i, --info           view package information\n"
 msgstr "  -i, --info           view package information\n"
 
@@ -572,10 +514,22 @@ msgstr "      --cachedir <dir> set an alternate package cache location\n"
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
-"                       the terms of the GNU General Public License\n"
+"                       the terms of the GNU General Public License.\n"
 msgstr ""
 "                       This program may be freely redistributed under\n"
-"                       the terms of the GNU General Public License\n"
+"                       the terms of the GNU General Public License.\n"
+
+#, c-format
+msgid "segmentation fault\n"
+msgstr "segmentation fault\n"
+
+#, c-format
+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"
 
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
@@ -622,6 +576,10 @@ msgid "config file %s, line %d: directive '%s' not recognized.\n"
 msgstr "config file %s, line %d: directive '%s' not recognised.\n"
 
 #, c-format
+msgid "invalid value for 'CleanMethod' : '%s'\n"
+msgstr "invalid value for 'CleanMethod' : '%s'\n"
+
+#, c-format
 msgid "failed to initialize alpm library (%s)\n"
 msgstr "failed to initialise alpm library (%s)\n"
 
@@ -638,32 +596,32 @@ msgid "no operation specified (use -h for help)\n"
 msgstr "no operation specified (use -h for help)\n"
 
 #, c-format
-msgid "error: no file was specified for --owns\n"
-msgstr "error: no file was specified for --owns\n"
+msgid "no file was specified for --owns\n"
+msgstr "no file was specified for --owns\n"
 
 #, c-format
-msgid "error: failed to read file '%s': %s\n"
-msgstr "error: failed to read file '%s': %s\n"
+msgid "failed to read file '%s': %s\n"
+msgstr "failed to read file '%s': %s\n"
 
 #, c-format
-msgid "error: cannot determine ownership of a directory\n"
-msgstr "error: cannot determine ownership of a directory\n"
+msgid "cannot determine ownership of a directory\n"
+msgstr "cannot determine ownership of a directory\n"
 
 #, c-format
-msgid "error: cannot determine real path for '%s': %s\n"
-msgstr "error: cannot determine real path for '%s': %s\n"
+msgid "cannot determine real path for '%s': %s\n"
+msgstr "cannot determine real path for '%s': %s\n"
 
 #, c-format
 msgid "%s is owned by %s %s\n"
 msgstr "%s is owned by %s %s\n"
 
 #, c-format
-msgid "error: No package owns %s\n"
-msgstr "error: No package owns %s\n"
+msgid "No package owns %s\n"
+msgstr "No package owns %s\n"
 
 #, c-format
-msgid "error: group \"%s\" was not found\n"
-msgstr "error: group \"%s\" was not found\n"
+msgid "group \"%s\" was not found\n"
+msgstr "group \"%s\" was not found\n"
 
 #, c-format
 msgid "Checking for package upgrades... \n"
@@ -678,24 +636,40 @@ msgid "no usable package repositories configured.\n"
 msgstr "no usable package repositories configured.\n"
 
 #, c-format
-msgid "error: package \"%s\" not found\n"
-msgstr "error: package \"%s\" not found\n"
+msgid "no targets specified (use -h for help)\n"
+msgstr "no targets specified (use -h for help)\n"
+
+#, c-format
+msgid "package \"%s\" not found\n"
+msgstr "package \"%s\" not found\n"
+
+#, c-format
+msgid "%s not found, searching for group...\n"
+msgstr "%s not found, searching for group...\n"
+
+#, c-format
+msgid "'%s': not found in local db\n"
+msgstr "'%s': not found in local db\n"
 
 #, c-format
 msgid ":: group %s:\n"
 msgstr ":: group %s:\n"
 
 #, c-format
-msgid "    Remove whole content? [Y/n] "
-msgstr "    Remove whole content? [Y/n] "
+msgid "    Remove whole content?"
+msgstr "    Remove whole content?"
 
 #, c-format
-msgid ":: Remove %s from group %s? [Y/n] "
-msgstr ":: Remove %s from group %s? [Y/n] "
+msgid ":: Remove %s from group %s?"
+msgstr ":: Remove %s from group %s?"
 
 #, c-format
-msgid "error: failed to init transaction (%s)\n"
-msgstr "error: failed to init transaction (%s)\n"
+msgid "failed to prepare transaction (%s)\n"
+msgstr "failed to prepare transaction (%s)\n"
+
+#, c-format
+msgid ":: %s: requires %s\n"
+msgstr ":: %s: requires %s\n"
 
 #, c-format
 msgid "Targets:"
@@ -704,30 +678,34 @@ msgstr "Targets:"
 #, c-format
 msgid ""
 "\n"
-"Do you want to remove these packages? [Y/n] "
+"Do you want to remove these packages?"
 msgstr ""
 "\n"
-"Do you want to remove these packages? [Y/n] "
+"Do you want to remove these packages?"
+
+#, c-format
+msgid "failed to commit transaction (%s)\n"
+msgstr "failed to commit transaction (%s)\n"
 
 #, c-format
-msgid "error: could not access database directory\n"
-msgstr "error: could not access database directory\n"
+msgid "could not access database directory\n"
+msgstr "could not access database directory\n"
 
 #, c-format
-msgid "Do you want to remove %s? [Y/n] "
-msgstr "Do you want to remove %s? [Y/n] "
+msgid "Do you want to remove %s?"
+msgstr "Do you want to remove %s?"
 
 #, c-format
-msgid "error: could not remove repository directory\n"
-msgstr "error: could not remove repository directory\n"
+msgid "could not remove repository directory\n"
+msgstr "could not remove repository directory\n"
 
 #, c-format
 msgid "Database directory: %s\n"
 msgstr "Database directory: %s\n"
 
 #, c-format
-msgid "Do you want to remove unused repositories? [Y/n] "
-msgstr "Do you want to remove unused repositories? [Y/n] "
+msgid "Do you want to remove unused repositories?"
+msgstr "Do you want to remove unused repositories?"
 
 #, c-format
 msgid "Database directory cleaned up\n"
@@ -738,144 +716,168 @@ msgid "Cache directory: %s\n"
 msgstr "Cache directory: %s\n"
 
 #, c-format
-msgid "Do you want to remove uninstalled packages from cache? [Y/n] "
-msgstr "Do you want to remove uninstalled packages from cache? [Y/n] "
+msgid "Do you want to remove uninstalled packages from cache?"
+msgstr "Do you want to remove uninstalled packages from cache?"
+
+#, c-format
+msgid "Do you want to remove outdated packages from cache?"
+msgstr "Do you want to remove outdated packages from cache?"
 
 #, c-format
 msgid "removing old packages from cache... "
 msgstr "removing old packages from cache... "
 
 #, c-format
-msgid "error: could not access cache directory\n"
-msgstr "error: could not access cache directory\n"
+msgid "could not access cache directory\n"
+msgstr "could not access cache directory\n"
 
 #, c-format
 msgid "done.\n"
 msgstr "done.\n"
 
 #, c-format
-msgid "Do you want to remove ALL packages from cache? [Y/n] "
-msgstr "Do you want to remove ALL packages from cache? [Y/n] "
+msgid "Do you want to remove ALL packages from cache?"
+msgstr "Do you want to remove ALL packages from cache?"
 
 #, c-format
 msgid "removing all packages from cache... "
 msgstr "removing all packages from cache... "
 
 #, c-format
-msgid "error: could not remove cache directory\n"
-msgstr "error: could not remove cache directory\n"
+msgid "could not remove cache directory\n"
+msgstr "could not remove cache directory\n"
 
 #, c-format
-msgid "error: could not create new cache directory\n"
-msgstr "error: could not create new cache directory\n"
+msgid "could not create new cache directory\n"
+msgstr "could not create new cache directory\n"
 
 #, c-format
-msgid "error: failed to release transaction (%s)\n"
-msgstr "error: failed to release transaction (%s)\n"
+msgid "failed to update %s (%s)\n"
+msgstr "failed to update %s (%s)\n"
 
 #, c-format
-msgid "error: failed to synchronize %s: %s\n"
-msgstr "error: failed to synchronise %s: %s\n"
+msgid " %s is up to date\n"
+msgstr " %s is up to date\n"
 
 #, c-format
-msgid "error: failed to update %s (%s)\n"
-msgstr "error: failed to update %s (%s)\n"
+msgid "failed to synchronize any databases\n"
+msgstr "failed to synchronise any databases\n"
 
 #, c-format
-msgid " %s is up to date\n"
-msgstr " %s is up to date\n"
+msgid "repository '%s' does not exist\n"
+msgstr "repository '%s' does not exist\n"
 
 #, c-format
-msgid "error: repository '%s' does not exist\n"
-msgstr "error: repository '%s' does not exist\n"
+msgid "package '%s' was not found in repository '%s'\n"
+msgstr "package '%s' was not found in repository '%s'\n"
 
 #, c-format
-msgid "error: package '%s' was not found in repository '%s'\n"
-msgstr "error: package '%s' was not found in repository '%s'\n"
+msgid "package '%s' was not found\n"
+msgstr "package '%s' was not found\n"
 
 #, c-format
-msgid "error: package '%s' was not found\n"
-msgstr "error: package '%s' was not found\n"
+msgid "repository \"%s\" was not found.\n"
+msgstr "repository \"%s\" was not found.\n"
 
 #, c-format
-msgid "error: repository \"%s\" was not found.\n"
-msgstr "error: repository \"%s\" was not found.\n"
+msgid ":: Starting full system upgrade...\n"
+msgstr ":: Starting full system upgrade...\n"
 
 #, c-format
-msgid ":: Synchronizing package databases...\n"
-msgstr ":: Synchronising package databases...\n"
+msgid "%s package not found, searching for group...\n"
+msgstr "%s package not found, searching for group...\n"
 
 #, c-format
-msgid "error: failed to synchronize any databases\n"
-msgstr "error: failed to synchronise any databases\n"
+msgid ":: group %s (including ignored packages):\n"
+msgstr ":: group %s (including ignored packages):\n"
 
 #, c-format
-msgid ":: Starting full system upgrade...\n"
-msgstr ":: Starting full system upgrade...\n"
+msgid ":: Install whole content?"
+msgstr ":: Install whole content?"
 
 #, c-format
-msgid ":: pacman has detected a newer version of itself.\n"
-msgstr ":: pacman has detected a newer version of itself.\n"
+msgid ":: Install %s from group %s?"
+msgstr ":: Install %s from group %s?"
 
 #, c-format
-msgid ""
-":: Do you want to cancel the current operation\n"
-":: and install the new pacman version now? [Y/n] "
-msgstr ""
-":: Do you want to cancel the current operation\n"
-":: and install the new pacman version now? [Y/n] "
+msgid "'%s': not found in sync db\n"
+msgstr "'%s': not found in sync db\n"
 
 #, c-format
-msgid "error: pacman: %s\n"
-msgstr "error: pacman: %s\n"
+msgid ":: %s: conflicts with %s\n"
+msgstr ":: %s: conflicts with %s\n"
 
 #, c-format
-msgid ":: group %s (including ignored packages):\n"
-msgstr ":: group %s (including ignored packages):\n"
+msgid " local database is up to date\n"
+msgstr " local database is up to date\n"
 
 #, c-format
-msgid ":: Install whole content? [Y/n] "
-msgstr ":: Install whole content? [Y/n] "
+msgid "Proceed with download?"
+msgstr "Proceed with download?"
 
 #, c-format
-msgid ":: Install %s from group %s? [Y/n] "
-msgstr ":: Install %s from group %s? [Y/n] "
+msgid "Proceed with installation?"
+msgstr "Proceed with installation?"
 
 #, c-format
-msgid "Warning: %s provides %s\n"
-msgstr "Warning: %s provides %s\n"
+msgid "%s exists in both '%s' and '%s'\n"
+msgstr "%s exists in both '%s' and '%s'\n"
 
 #, c-format
-msgid "error: several packages provide %s, please specify one :\n"
-msgstr "error: several packages provide %s, please specify one :\n"
+msgid "%s: %s exists in filesystem\n"
+msgstr "%s: %s exists in filesystem\n"
 
 #, c-format
-msgid "error: '%s': not found in sync db\n"
-msgstr "error: '%s': not found in sync db\n"
+msgid "%s is invalid or corrupted\n"
+msgstr "%s is invalid or corrupted\n"
 
 #, c-format
-msgid " local database is up to date\n"
-msgstr " local database is up to date\n"
+msgid "Errors occurred, no packages were upgraded.\n"
+msgstr "Errors occurred, no packages were upgraded.\n"
 
 #, c-format
-msgid "Beginning download...\n"
-msgstr "Beginning download...\n"
+msgid ":: Synchronizing package databases...\n"
+msgstr ":: Synchronising package databases...\n"
 
 #, c-format
-msgid "Proceed with download? [Y/n] "
-msgstr "Proceed with download? [Y/n] "
+msgid ":: The following packages should be upgraded first :\n"
+msgstr ":: The following packages should be upgraded first :\n"
 
 #, c-format
-msgid "Beginning upgrade process...\n"
-msgstr "Beginning upgrade process...\n"
+msgid ""
+":: Do you want to cancel the current operation\n"
+":: and upgrade these packages now?"
+msgstr ""
+":: Do you want to cancel the current operation\n"
+":: and upgrade these packages now?"
 
 #, c-format
-msgid "Proceed with installation? [Y/n] "
-msgstr "Proceed with installation? [Y/n] "
+msgid "loading package data...\n"
+msgstr "loading package data...\n"
 
 #, c-format
-msgid "Errors occurred, no packages were upgraded.\n"
-msgstr "Errors occurred, no packages were upgraded.\n"
+msgid ""
+"\n"
+"errors occurred, no packages were upgraded.\n"
+msgstr ""
+"\n"
+"errors occurred, no packages were upgraded.\n"
+
+#, c-format
+msgid "failed to init transaction (%s)\n"
+msgstr "failed to init transaction (%s)\n"
+
+#, c-format
+msgid ""
+"  if you're sure a package manager is not already\n"
+"  running, you can remove %s\n"
+msgstr ""
+"  if you're sure a package manager is not already\n"
+"  running, you can remove %s\n"
+
+#, c-format
+msgid "failed to release transaction (%s)\n"
+msgstr "failed to release transaction (%s)\n"
 
 #, c-format
 msgid "None\n"
@@ -898,6 +900,14 @@ msgid "Total Installed Size:   %.2f MB\n"
 msgstr "Total Installed Size:   %.2f MB\n"
 
 #, c-format
+msgid "[Y/n]"
+msgstr "[Y/n]"
+
+#, c-format
+msgid "[y/N]"
+msgstr "[y/N]"
+
+#, c-format
 msgid "Y"
 msgstr "Y"
 
@@ -906,6 +916,14 @@ msgid "YES"
 msgstr "YES"
 
 #, c-format
+msgid "N"
+msgstr "N"
+
+#, c-format
+msgid "NO"
+msgstr "NO"
+
+#, c-format
 msgid "error: %s"
 msgstr "error: %s"
 
@@ -929,75 +947,6 @@ msgstr "warning: "
 msgid "function: "
 msgstr "function: "
 
-msgid "Usage: %s <root> <destfile> [package_directory]"
-msgstr "Usage: %s <root> <destfile> [package_directory]"
-
-msgid ""
-"NOTE: this script is DEPRECATED. It will be removed in the next major"
-"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
-msgstr ""
-"NOTE: this script is DEPRECATED. It will be removed in the next major"
-"\\nrelease of pacman, so please use repo-add and repo-remove instead.\\n\\n"
-
-msgid ""
-"gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
-"<root>. gensync builds the database in a temporary directory\\nand then "
-"compresses it to <destfile>.\\n\\n"
-msgstr ""
-"gensync will generate a sync database by reading all PKGBUILD files\\nfrom "
-"<root>. gensync builds the database in a temporary directory\\nand then "
-"compresses it to <destfile>.\\n\\n"
-
-msgid ""
-"gensync will calculate md5sums of packages in the same directory as"
-"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
-msgstr ""
-"gensync will calculate md5sums of packages in the same directory as"
-"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
-
-msgid ""
-"note: The <destfile> name is important. It must be of the form\\n      "
-"{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
-"package repository you configured in /etc/pacman.conf. The\\n      generated "
-"database must reside in the same directory as your\\n      custom packages "
-"(also configured in /etc/pacman.conf)\\n\\n"
-msgstr ""
-"note: The <destfile> name is important. It must be of the form\\n      "
-"{treename}.db.tar.gz where {treename} is the name of the custom\\n      "
-"package repository you configured in /etc/pacman.conf. The\\n      generated "
-"database must reside in the same directory as your\\n      custom packages "
-"(also configured in /etc/pacman.conf)\\n\\n"
-
-msgid "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-msgstr "Example:  gensync /var/abs/local /home/mypkgs/custom.db.tar.gz"
-
-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 "%s not found. Can not continue."
-msgstr "%s not found. Can not continue."
-
-msgid "invalid root dir: %s"
-msgstr "invalid root dir: %s"
-
-msgid "gensync: building database entries, generating md5sums..."
-msgstr "gensync: building database entries, generating md5sums..."
-
-msgid "failed to parse %s"
-msgstr "failed to parse %s"
-
-msgid "could not find %s-%s-%s-%s%s - skipping"
-msgstr "could not find %s-%s-%s-%s%s - skipping"
-
-msgid "creating repo DB..."
-msgstr "creating repo DB..."
-
 msgid "WARNING:"
 msgstr "WARNING:"
 
@@ -1007,20 +956,6 @@ msgstr "ERROR:"
 msgid "Cleaning up..."
 msgstr "Cleaning up..."
 
-msgid ""
-"Options beginning with 'no' will be deprecated in the next version of "
-"makepkg!"
-msgstr ""
-"Options beginning with 'no' will be deprecated in the next version of "
-"makepkg!"
-
-msgid "Please replace 'no' with '!': %s -> %s."
-msgstr "Please replace 'no' with '!': %s -> %s."
-
-msgid "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-msgstr ""
-"Option 'keepdocs' may not work as intended. Please replace with 'docs'."
-
 msgid "There is no agent set up to handle %s URLs. Check %s."
 msgstr "There is no agent set up to handle %s URLs. Check %s."
 
@@ -1039,24 +974,15 @@ msgstr "Installing missing dependencies..."
 msgid "Pacman failed to install missing dependencies."
 msgstr "Pacman failed to install missing dependencies."
 
-msgid "Building missing dependencies..."
-msgstr "Building missing dependencies..."
-
-msgid "Source root cannot be found - please make sure it is specified in %s."
-msgstr "Source root cannot be found - please make sure it is specified in %s."
-
-msgid "Could not find '%s' under %s"
-msgstr "Could not find '%s' under %s"
-
-msgid "Failed to build '%s'"
-msgstr "Failed to build '%s'"
-
 msgid "Failed to install all missing dependencies."
 msgstr "Failed to install all missing dependencies."
 
 msgid "Missing Dependencies:"
 msgstr "Missing Dependencies:"
 
+msgid "Failed to remove installed dependencies."
+msgstr "Failed to remove installed dependencies."
+
 msgid "Retrieving Sources..."
 msgstr "Retrieving Sources..."
 
@@ -1084,8 +1010,8 @@ msgstr "Generating checksums for source files..."
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Invalid integrity algorithm '%s' specified."
 
-msgid "Cannot find the '%s' program."
-msgstr "Cannot find the '%s' program."
+msgid "Cannot find openssl."
+msgstr "Cannot find openssl."
 
 msgid "Unable to find source file %s to generate checksum."
 msgstr "Unable to find source file %s to generate checksum."
@@ -1237,9 +1163,6 @@ msgstr "Options:"
 msgid "  -A, --ignorearch Ignore incomplete arch field in %s"
 msgstr "  -A, --ignorearch Ignore incomplete arch field in %s"
 
-msgid "  -b, --builddeps  Build missing dependencies from source"
-msgstr "  -b, --builddeps  Build missing dependencies from source"
-
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Clean up work files after build"
 
@@ -1319,12 +1242,18 @@ msgstr ""
 msgid "If -p is not specified, makepkg will look for '%s'"
 msgstr "If -p is not specified, makepkg will look for '%s'"
 
+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 "%s not found."
 msgstr "%s not found."
 
-msgid "Sudo is used by default now. The --usesudo option is deprecated!"
-msgstr "Sudo is used by default now. The --usesudo option is deprecated!"
-
 msgid "\\0--holdver and --forcever cannot both be specified"
 msgstr "\\0--holdver and --forcever cannot both be specified"
 
@@ -1415,6 +1344,9 @@ msgstr "such as arch=('%s')."
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Install scriptlet (%s) does not exist."
 
+msgid "options array contains unknown option '%s'"
+msgstr "options array contains unknown option '%s'"
+
 msgid "A package has already been built, installing existing package..."
 msgstr "A package has already been built, installing existing package..."
 
@@ -1548,8 +1480,11 @@ msgstr "Finished. Your pacman database has been optimised."
 msgid "For full benefits of pacman-optimize, run 'sync' now."
 msgstr "For full benefits of pacman-optimize, run 'sync' now."
 
-msgid "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
-msgstr "Usage: %s <path-to-db> [--force] <package> ...\\n\\n"
+msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
+msgstr "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
+
+msgid "Usage: repo-remove [-q] <path-to-db> <packagename> ...\\n\\n"
+msgstr "Usage: repo-remove [-q] <path-to-db> <packagename> ...\\n\\n"
 
 msgid ""
 "repo-add will update a package database by reading a package file."
@@ -1559,32 +1494,41 @@ msgstr ""
 "\\nMultiple packages to add can be specified on the command line.\\n\\n"
 
 msgid ""
-"The --force flag will add a 'force' entry to the sync database, which"
-"\\ntells pacman to skip its internal version number checking and update"
-"\\nthe package regardless.\\n\\n"
+"repo-remove will update a package database by removing the package name"
+"\\nspecified on the command line from the given repo database. Multiple"
+"\\npackages to remove can be specified on the command line.\\n\\n"
 msgstr ""
-"The --force flag will add a 'force' entry to the sync database, which"
-"\\ntells pacman to skip its internal version number checking and update"
-"\\nthe package regardless.\\n\\n"
+"repo-remove will update a package database by removing the package name"
+"\\nspecified on the command line from the given repo database. Multiple"
+"\\npackages to remove can be specified on the command line.\\n\\n"
+
+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 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 msgstr "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz"
 
+msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+msgstr "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
+
 msgid ""
-"Copyright (C) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+"Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\nCopyright (c) "
+"2007-2008 Dan McGee <dan@archlinux.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) 2006 Aaron Griffin <aaron@archlinux.org>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+"Copyright (C) 2006-2008 Aaron Griffin <aaron@archlinux.org>.\\nCopyright (c) "
+"2007-2008 Dan McGee <dan@archlinux.org>.\\n\\nThis is free software; see the "
+"source for copying conditions.\\nThere is NO WARRANTY, to the extent "
+"permitted by law.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Invalid package file '%s'."
 
-msgid "Removing existing package '%s'..."
-msgstr "Removing existing package '%s'..."
-
 msgid "Creating 'desc' db entry..."
 msgstr "Creating 'desc' db entry..."
 
@@ -1603,18 +1547,36 @@ msgstr "Added delta '%s'"
 msgid "Could not add delta '%s'"
 msgstr "Could not add delta '%s'"
 
+msgid "Removing existing package '%s'..."
+msgstr "Removing existing package '%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 "Cannot create temp directory for database building."
 msgstr "Cannot create temp directory for database building."
 
+msgid "Invalid command name '%s' specified."
+msgstr "Invalid command name '%s' specified."
+
+msgid "the -f and --force options are no longer recognized"
+msgstr "the -f and --force options are no longer recognised"
+
+msgid "use options=(force) in the PKGBUILD instead"
+msgstr "use options=(force) in the PKGBUILD instead"
+
 msgid "Repository file '%s' is not a proper pacman database."
 msgstr "Repository file '%s' is not a proper pacman database."
 
 msgid "Extracting database to a temporary location..."
 msgstr "Extracting database to a temporary location..."
 
+msgid "Repository file '%s' was not found."
+msgstr "Repository file '%s' was not found."
+
 msgid "'%s' is not a package file, skipping"
 msgstr "'%s' is not a package file, skipping"
 
@@ -1624,129 +1586,20 @@ msgstr "Adding package '%s'"
 msgid "Package '%s' not found."
 msgstr "Package '%s' not found."
 
-msgid "Creating updated database file %s"
-msgstr "Creating updated database file %s"
-
-msgid "No compression set."
-msgstr "No compression set."
-
-msgid "No packages modified, nothing to do."
-msgstr "No packages modified, nothing to do."
-
-msgid "repo-remove %s\\n\\n"
-msgstr "repo-remove %s\\n\\n"
-
-msgid "usage: %s <path-to-db> <packagename> ...\\n\\n"
-msgstr "usage: %s <path-to-db> <packagename> ...\\n\\n"
-
-msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n\\n"
-msgstr ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n\\n"
-
-msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-msgstr "Example:  repo-remove /path/to/repo.db.tar.gz kernel26"
-
 msgid "Searching for package '%s'..."
 msgstr "Searching for package '%s'..."
 
 msgid "Package matching '%s' not found."
 msgstr "Package matching '%s' not found."
 
-msgid "Creating updated database file '%s'..."
-msgstr "Creating updated database file '%s'..."
+msgid "Creating updated database file '%s'"
+msgstr "Creating updated database file '%s'"
+
+msgid "No compression set."
+msgstr "No compression set."
 
 msgid "All packages have been removed from the database. Deleting '%s'."
 msgstr "All packages have been removed from the database. Deleting '%s'."
 
-msgid "Usage: %s <action> <destfile> <option> [package_directory]"
-msgstr "Usage: %s <action> <destfile> <option> [package_directory]"
-
-msgid ""
-"updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
-"the destfile. updatesync updates the database in a temporary\\ndirectory and "
-"then compresses it to <destfile>.\\n\\n"
-msgstr ""
-"updatesync will update a sync database by reading a PKGBUILD and\\nmodifying "
-"the destfile. updatesync updates the database in a temporary\\ndirectory and "
-"then compresses it to <destfile>.\\n\\n"
-
-msgid "There are two types of actions:\\n\\n"
-msgstr "There are two types of actions:\\n\\n"
-
-msgid ""
-"upd - Will update a package's entry or create it if it doesn't exist."
-"\\n      It takes the package's PKGBUILD as an option.\\n"
-msgstr ""
-"upd - Will update a package's entry or create it if it doesn't exist."
-"\\n      It takes the package's PKGBUILD as an option.\\n"
-
-msgid ""
-"del - Will remove a package's entry from the db. It takes the package's"
-"\\n      name as an option.\\n"
-msgstr ""
-"del - Will remove a package's entry from the db. It takes the package's"
-"\\n      name as an option.\\n"
-
-msgid ""
-"updatesync will calculate md5sums of packages in the same directory as"
-"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
-msgstr ""
-"updatesync will calculate md5sums of packages in the same directory as"
-"\\n<destfile>, unless an alternate [package_directory] is specified.\\n\\n"
-
-msgid "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
-msgstr "Example:  updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD"
-
-msgid ""
-"Copyright (C) 2004 Jason Chu <jason@archlinux.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) 2004 Jason Chu <jason@archlinux.org>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
-
-msgid "%s not found"
-msgstr "%s not found"
-
-msgid "could not find %s-%s-%s-%s%s - aborting"
-msgstr "could not find %s-%s-%s-%s%s - aborting"
-
-#~ msgid "error: failed to add target '%s' (%s)"
-#~ msgstr "error: failed to add target '%s' (%s)"
-
-#~ msgid ":: %s: conflicts with %s"
-#~ msgstr ":: %s: conflicts with %s"
-
-#~ msgid "error: failed to add target '%s' (%s)\n"
-#~ msgstr "error: failed to add target '%s' (%s)\n"
-
-#~ msgid ""
-#~ ":: pacman has detected a newer version of itself.\n"
-#~ ":: It is recommended that you upgrade pacman by itself\n"
-#~ ":: using 'pacman -S pacman', and then rerun the current\n"
-#~ ":: operation. If you wish to continue the operation and\n"
-#~ ":: not upgrade pacman separately, answer no.\n"
-#~ msgstr ""
-#~ ":: pacman has detected a newer version of itself.\n"
-#~ ":: It is recommended that you upgrade pacman by itself\n"
-#~ ":: using 'pacman -S pacman', and then rerun the current\n"
-#~ ":: operation. If you wish to continue the operation and\n"
-#~ ":: not upgrade pacman separately, answer no.\n"
-
-#~ msgid ":: Cancel current operation? [Y/n] "
-#~ msgstr ":: Cancel current operation? [Y/n] "
-
-#~ msgid "debug: %s"
-#~ msgstr "debug: %s"
-
-#~ msgid "debug: "
-#~ msgstr "debug: "
-
-#~ msgid "--"
-#~ msgstr "--"
+msgid "No packages modified, nothing to do."
+msgstr "No packages modified, nothing to do."