Update string catalogs after string tweaks

This also pulls in some early translations we had entered in Transifex
in the last day so those would not be lost. The diffstat is huge and not
very telling as usual, as all sorts of fuzzyness switches happened this
time around for some reason.

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 192 insertions, 301 deletions

diff --git a/scripts/po/en_GB.po b/scripts/po/en_GB.po
index c1c89b83..fae82f54 100644
--- a/scripts/po/en_GB.po
+++ b/scripts/po/en_GB.po
@@ -1,14 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-08-08 17:07-0500\n"
-"PO-Revision-Date: 2011-03-28 02:45+0000\n"
+"POT-Creation-Date: 2011-08-09 15:51-0500\n"
+"PO-Revision-Date: 2011-08-09 01:00+0000\n"
 "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -26,9 +25,8 @@ msgstr "ERROR:"
 msgid "Cleaning up..."
 msgstr "Cleaning up..."
 
-#, fuzzy
 msgid "Entering %s environment..."
-msgstr "Entering fakeroot environment..."
+msgstr "Entering %s environment..."
 
 msgid "Unable to find source file %s."
 msgstr "Unable to find source file %s."
@@ -77,6 +75,7 @@ msgstr "Generating checksums for source files..."
 
 msgid "Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Invalid integrity algorithm '%s' specified."
@@ -102,48 +101,45 @@ msgstr "Integrity checks (%s) differ in size from the source array."
 msgid "Integrity checks are missing."
 msgstr "Integrity checks are missing."
 
-#, fuzzy
 msgid "Verifying source file signatures with %s..."
-msgstr "Validating source files with %s..."
+msgstr "Verifying source file signatures with %s..."
 
-#, fuzzy
 msgid "SIGNATURE NOT FOUND"
-msgstr "NOT FOUND"
+msgstr "SIGNATURE NOT FOUND"
 
-#, fuzzy
 msgid "SOURCE FILE NOT FOUND"
-msgstr "NOT FOUND"
+msgstr "SOURCE FILE NOT FOUND"
 
-msgid "Warning: Unknown public key"
-msgstr ""
+#, fuzzy
+msgid "Unknown public key"
+msgstr "Warning: Unknown public key"
 
 msgid "Warning: the key has been revoked."
-msgstr ""
+msgstr "Warning: the key has been revoked."
 
 msgid "Warning: the signature has expired."
-msgstr ""
+msgstr "Warning: the signature has expired."
 
 msgid "Warning: the key has expired."
-msgstr ""
+msgstr "Warning: the key has expired."
 
 msgid "One or more PGP signatures could not be verified!"
-msgstr ""
+msgstr "One or more PGP signatures could not be verified!"
 
 msgid "Warnings have occurred while verifying the signatures."
-msgstr ""
+msgstr "Warnings have occurred while verifying the signatures."
 
 msgid "Please make sure you really trust them."
-msgstr ""
+msgstr "Please make sure you really trust them."
 
-#, fuzzy
 msgid "Skipping all source file integrity checks."
-msgstr "Skipping integrity checks."
+msgstr "Skipping all source file integrity checks."
 
 msgid "Skipping verification of source file checksums."
-msgstr ""
+msgstr "Skipping verification of source file checksums."
 
 msgid "Skipping verification of source file PGP signatures."
-msgstr ""
+msgstr "Skipping verification of source file PGP signatures."
 
 msgid "Extracting Sources..."
 msgstr "Extracting Sources..."
@@ -166,9 +162,8 @@ msgstr "Tidying install..."
 msgid "Removing doc files..."
 msgstr "Removing doc files..."
 
-#, fuzzy
 msgid "Purging unwanted files..."
-msgstr "Purging other files..."
+msgstr "Purging unwanted files..."
 
 msgid "Compressing man and info pages..."
 msgstr "Compressing man and info pages..."
@@ -176,45 +171,38 @@ msgstr "Compressing man and info pages..."
 msgid "Stripping unneeded symbols from binaries and libraries..."
 msgstr "Stripping unneeded symbols from binaries and libraries..."
 
-#, fuzzy
 msgid "Removing %s files..."
-msgstr "Removing doc files..."
+msgstr "Removing %s files..."
 
 msgid "Removing empty directories..."
 msgstr "Removing empty directories..."
 
-#, fuzzy
 msgid "Compressing binaries with %s..."
-msgstr "Compressing man and info pages..."
+msgstr "Compressing binaries with %s..."
 
-#, fuzzy
 msgid "Could not compress binary : %s"
-msgstr "could not access cache directory %s\n"
+msgstr "Could not compress binary : %s"
 
-#, fuzzy
 msgid "Generating %s file..."
-msgstr "Generating .PKGINFO file..."
+msgstr "Generating %s file..."
 
 msgid "Cannot find library listed in %s: %s"
-msgstr ""
+msgstr "Cannot find library listed in %s: %s"
 
 msgid "Please add a license line to your %s!"
 msgstr "Please add a license line to your %s!"
 
-#, fuzzy
 msgid "Example for GPL'ed software: %s."
-msgstr "Example for GPL'ed software: license=('GPL')."
+msgstr "Example for GPL'ed software: %s."
 
-#, fuzzy
 msgid "%s entry file not in package : %s"
-msgstr "Backup entry file not in package : %s"
+msgstr "%s entry file not in package : %s"
 
 msgid "Package contains reference to %s"
 msgstr "Package contains reference to %s"
 
-#, fuzzy
 msgid "Missing %s directory."
-msgstr "Missing pkg/ directory."
+msgstr "Missing %s directory."
 
 msgid "Creating package..."
 msgstr "Creating package..."
@@ -234,17 +222,14 @@ msgstr "Failed to create package file."
 msgid "Failed to create symlink to package file."
 msgstr "Failed to create symlink to package file."
 
-#, fuzzy
 msgid "Signing package..."
-msgstr "Creating package..."
+msgstr "Signing package..."
 
-#, fuzzy
 msgid "Created signature file %s."
-msgstr "Creating updated database file '%s'"
+msgstr "Created signature file %s."
 
-#, fuzzy
 msgid "Failed to sign package file."
-msgstr "Failed to create package file."
+msgstr "Failed to sign package file."
 
 msgid "Creating source package..."
 msgstr "Creating source package..."
@@ -264,13 +249,11 @@ msgstr "Failed to create source package file."
 msgid "Failed to create symlink to source package file."
 msgstr "Failed to create symlink to source package file."
 
-#, fuzzy
 msgid "Installing package %s with %s..."
-msgstr "Installing package %s with %s -U..."
+msgstr "Installing package %s with %s..."
 
-#, fuzzy
 msgid "Installing %s package group with %s..."
-msgstr "Installing %s package group with %s -U..."
+msgstr "Installing %s package group with %s..."
 
 msgid "Failed to install built package(s)."
 msgstr "Failed to install built package(s)."
@@ -281,13 +264,11 @@ msgstr "%s is not allowed to be empty."
 msgid "%s is not allowed to start with a hyphen."
 msgstr "%s is not allowed to start with a hyphen."
 
-#, fuzzy
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr "%s is not allowed to contain colons or hyphens."
+msgstr "%s is not allowed to contain colons, hyphens or whitespace."
 
-#, fuzzy
 msgid "%s is not allowed to contain hyphens or whitespace."
-msgstr "%s is not allowed to contain hyphens."
+msgstr "%s is not allowed to contain hyphens or whitespace."
 
 msgid "%s must be an integer."
 msgstr "%s must be an integer."
@@ -298,70 +279,63 @@ msgstr "%s is not available for the '%s' architecture."
 msgid "Note that many packages may need a line added to their %s"
 msgstr "Note that many packages may need a line added to their %s"
 
-#, fuzzy
 msgid "such as %s."
-msgstr "such as arch=('%s')."
+msgstr "such as %s."
 
-#, fuzzy
 msgid "%s array cannot contain comparison (< or >) operators."
-msgstr "Provides array cannot contain comparison (< or >) operators."
+msgstr "%s array cannot contain comparison (< or >) operators."
 
-#, fuzzy
 msgid "%s entry should not contain leading slash : %s"
-msgstr "Backup entry should not contain leading slash : %s"
+msgstr "%s entry should not contain leading slash : %s"
 
-#, fuzzy
 msgid "Invalid syntax for %s : '%s'"
-msgstr "Invalid syntax for optdepend : '%s'"
+msgstr "Invalid syntax for %s : '%s'"
 
 msgid "%s file (%s) does not exist."
 msgstr "%s file (%s) does not exist."
 
-#, fuzzy
 msgid "%s array contains unknown option '%s'"
-msgstr "options array contains unknown option '%s'"
+msgstr "%s array contains unknown option '%s'"
 
-#, fuzzy
 msgid "Missing %s function for split package '%s'"
-msgstr "missing package function for split package '%s'"
+msgstr "Missing %s function for split package '%s'"
 
-#, fuzzy
 msgid "Requested package %s is not provided in %s"
-msgstr "requested package %s is not provided in %s"
+msgstr "Requested package %s is not provided in %s"
 
 msgid "Sudo can not be found. Will use su to acquire root privileges."
 msgstr "Sudo can not be found. Will use su to acquire root privileges."
 
 msgid "Cannot find the %s binary required for building as non-root user."
-msgstr ""
+msgstr "Cannot find the %s binary required for building as non-root user."
 
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
+msgstr "Cannot find the %s binary required for signing packages."
 
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
+msgstr "Cannot find the %s binary required for verifying source files."
 
 msgid "Cannot find the %s binary required for validating sourcefile checksums."
 msgstr ""
+"Cannot find the %s binary required for validating sourcefile checksums."
 
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
+msgstr "Cannot find the %s binary required for compressing binaries."
 
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
+msgstr "Cannot find the %s binary required for distributed compilation."
 
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
+msgstr "Cannot find the %s binary required for compiler cache usage."
 
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
+msgstr "Cannot find the %s binary required for object file stripping."
 
-#, fuzzy
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr "Compressing man and info pages..."
+msgstr "Cannot find the %s binary required for compressing man and info pages."
 
 msgid "Cannot find the %s binary required to determine latest %s revision."
-msgstr ""
+msgstr "Cannot find the %s binary required to determine latest %s revision."
 
 msgid "Determining latest %s revision..."
 msgstr "Determining latest %s revision..."
@@ -375,9 +349,8 @@ msgstr "Usage: %s [options]"
 msgid "Options:"
 msgstr "Options:"
 
-#, fuzzy
 msgid "  -A, --ignorearch Ignore incomplete %s field in %s"
-msgstr "  -A, --ignorearch Ignore incomplete arch field in %s"
+msgstr "  -A, --ignorearch Ignore incomplete %s field in %s"
 
 msgid "  -c, --clean      Clean up work files after build"
 msgstr "  -c, --clean      Clean up work files after build"
@@ -385,9 +358,8 @@ msgstr "  -c, --clean      Clean up work files after build"
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Skip all dependency checks"
 
-#, fuzzy
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr "  -e, --noextract  Do not extract source files (use existing src/ dir)"
+msgstr "  -e, --noextract  Do not extract source files (use existing %s dir)"
 
 msgid "  -f, --force      Overwrite existing package"
 msgstr "  -f, --force      Overwrite existing package"
@@ -395,9 +367,8 @@ msgstr "  -f, --force      Overwrite existing package"
 msgid "  -g, --geninteg   Generate integrity checks for source files"
 msgstr "  -g, --geninteg   Generate integrity checks for source files"
 
-#, fuzzy
 msgid "  -h, --help       Show this help message and exit"
-msgstr "  -h, --help       This help"
+msgstr "  -h, --help       Show this help message and exit"
 
 msgid "  -i, --install    Install package after successful build"
 msgstr "  -i, --install    Install package after successful build"
@@ -423,9 +394,8 @@ msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr ""
 "  -R, --repackage  Repackage contents of the package without rebuilding"
 
-#, fuzzy
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
-msgstr "  -s, --syncdeps   Install missing dependencies with pacman"
+msgstr "  -s, --syncdeps   Install missing dependencies with %s"
 
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
@@ -434,13 +404,11 @@ msgstr ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
 
-#, fuzzy
 msgid "  --asroot         Allow %s to run as root user"
-msgstr "  --asroot         Allow makepkg to run as root user"
+msgstr "  --asroot         Allow %s to run as root user"
 
-#, fuzzy
 msgid "  --check          Run the %s function in the %s"
-msgstr "  --check          Run the check() function in the %s"
+msgstr "  --check          Run the %s function in the %s"
 
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
 msgstr "  --config <file>  Use an alternate config file (instead of '%s')"
@@ -450,46 +418,42 @@ msgid ""
 msgstr ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 
-#, fuzzy
 msgid ""
 "  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr ""
+"  --key <key>      Specify a key to use for %s signing instead of the default"
 
-#, fuzzy
 msgid "  --nocheck        Do not run the %s function in the %s"
-msgstr "  --nocheck        Do not run the check() function in the %s"
+msgstr "  --nocheck        Do not run the %s function in the %s"
 
-#, fuzzy
 msgid "  --nosign         Do not create a signature for the package"
-msgstr "      --needed         don't reinstall up to date packages\n"
+msgstr "  --nosign         Do not create a signature for the package"
 
 msgid "  --pkg <list>     Only build listed packages from a split package"
 msgstr "  --pkg <list>     Only build listed packages from a split package"
 
-#, fuzzy
 msgid "  --sign           Sign the resulting package with %s"
-msgstr "      --needed         don't reinstall up to date packages\n"
+msgstr "  --sign           Sign the resulting package with %s"
 
-#, fuzzy
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr "  -g, --geninteg   Generate integrity checks for source files"
+msgstr "  --skipchecksums  Do not verify checksums of the source files"
 
-#, fuzzy
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr "  --skipinteg      Do not fail when integrity checks are missing"
-
-msgid "  --skippgpcheck   Do not verify source files with pgp signatures"
 msgstr ""
+"  --skipinteg      Do not perform any verification checks on source files"
+
+#, fuzzy
+msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
+msgstr "  --skippgpcheck   Do not verify source files with pgp signatures"
 
 msgid ""
 "  --source         Generate a source-only tarball without downloaded sources"
 msgstr ""
 "  --source         Generate a source-only tarball without downloaded sources"
 
-#, fuzzy
 msgid "These options can be passed to %s:"
-msgstr "These options can be passed to pacman:"
+msgstr "These options can be passed to %s:"
 
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
@@ -499,9 +463,8 @@ msgstr ""
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  Do not show a progress bar when downloading files"
 
-#, fuzzy
 msgid "If %s is not specified, %s will look for '%s'"
-msgstr "If -p is not specified, makepkg will look for '%s'"
+msgstr "If %s is not specified, %s will look for '%s'"
 
 msgid ""
 "Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>."
@@ -517,9 +480,8 @@ msgstr ""
 msgid "%s not found."
 msgstr "%s not found."
 
-#, fuzzy
 msgid "You do not have write permission to create packages in %s."
-msgstr "You do not have write permission to store packages in %s."
+msgstr "You do not have write permission to create packages in %s."
 
 msgid "You do not have write permission to store packages in %s."
 msgstr "You do not have write permission to store packages in %s."
@@ -527,87 +489,65 @@ msgstr "You do not have write permission to store packages in %s."
 msgid "You do not have write permission to store downloads in %s."
 msgstr "You do not have write permission to store downloads in %s."
 
-#, fuzzy
 msgid "\\0%s and %s cannot both be specified"
-msgstr "\\0--holdver and --forcever cannot both be specified"
-
-#, fuzzy
-msgid "Running %s as root is a BAD idea and can cause"
-msgstr "Running makepkg as root is a BAD idea and can cause"
-
-msgid "permanent, catastrophic damage to your system. If you"
-msgstr "permanent, catastrophic damage to your system. If you"
-
-#, fuzzy
-msgid "wish to run as root, please use the %s option."
-msgstr "wish to run as root, please use the --asroot option."
+msgstr "\\0%s and %s cannot both be specified"
 
-#, fuzzy
-msgid "The %s option is meant for the root user only."
-msgstr "The --asroot option is meant for the root user only."
-
-#, fuzzy
-msgid "Please rerun %s without the %s flag."
-msgstr "Please rerun makepkg without the --asroot flag."
-
-#, fuzzy
-msgid "Running %s as an unprivileged user will result in non-root"
-msgstr "Running makepkg as an unprivileged user will result in non-root"
+msgid ""
+"Running %s as root is a BAD idea and can cause permanent,\\ncatastrophic "
+"damage to your system. If you wish to run as root, please\\nuse the %s "
+"option."
+msgstr ""
 
 #, fuzzy
-msgid "ownership of the packaged files. Try using the %s environment by"
-msgstr "ownership of the packaged files. Try using the fakeroot environment by"
+msgid ""
+"The %s option is meant for the root user only. Please\\nrerun %s without the "
+"%s flag."
+msgstr "The %s option is meant for the root user only."
 
-#, fuzzy
-msgid "placing %s in the %s array in %s."
-msgstr "placing 'fakeroot' in the BUILDENV array in %s."
+msgid ""
+"Running %s as an unprivileged user will result in non-root\\nownership of "
+"the packaged files. Try using the %s environment by\\nplacing %s in the %s "
+"array in %s."
+msgstr ""
 
-#, fuzzy
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr "Do not use the '-F' option. This option is only for use by makepkg."
+msgstr "Do not use the %s option. This option is only for use by %s."
 
 msgid "%s does not exist."
 msgstr "%s does not exist."
 
-#, fuzzy
 msgid "%s contains %s characters and cannot be sourced."
-msgstr "%s contains CRLF characters and cannot be sourced."
+msgstr "%s contains %s characters and cannot be sourced."
 
-#, fuzzy
 msgid "The key %s does not exist in your keyring."
-msgstr "%s does not exist or is not a directory."
+msgstr "The key %s does not exist in your keyring."
 
 msgid "There is no key in your keyring."
-msgstr ""
+msgstr "There is no key in your keyring."
 
 msgid "A package has already been built, installing existing package..."
 msgstr "A package has already been built, installing existing package..."
 
-#, fuzzy
 msgid "A package has already been built. (use %s to overwrite)"
-msgstr "A package has already been built. (use -f to overwrite)"
+msgstr "A package has already been built. (use %s to overwrite)"
 
 msgid ""
 "The package group has already been built, installing existing packages..."
 msgstr ""
 "The package group has already been built, installing existing packages..."
 
-#, fuzzy
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr "The package group has already been built. (use -f to overwrite)"
+msgstr "The package group has already been built. (use %s to overwrite)"
 
-#, fuzzy
 msgid "Part of the package group has already been built. (use %s to overwrite)"
 msgstr ""
-"Part of the package group has already been built. (use -f to overwrite)"
+"Part of the package group has already been built. (use %s to overwrite)"
 
-#, fuzzy
 msgid "Leaving %s environment."
-msgstr "Leaving fakeroot environment."
+msgstr "Leaving %s environment."
 
-#, fuzzy
 msgid "Repackaging without the use of a %s function is deprecated."
-msgstr "Repackaging without the use of a package() function is deprecated."
+msgstr "Repackaging without the use of a %s function is deprecated."
 
 msgid "File permissions may not be preserved."
 msgstr "File permissions may not be preserved."
@@ -615,9 +555,8 @@ msgstr "File permissions may not be preserved."
 msgid "Making package: %s"
 msgstr "Making package: %s"
 
-#, fuzzy
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr "A source package has already been built. (use -f to overwrite)"
+msgstr "A source package has already been built. (use %s to overwrite)"
 
 msgid "Source package created: %s"
 msgstr "Source package created: %s"
@@ -634,21 +573,17 @@ msgstr "Checking buildtime dependencies..."
 msgid "Could not resolve all dependencies."
 msgstr "Could not resolve all dependencies."
 
-#, fuzzy
 msgid "%s was not found in %s; skipping dependency checks."
-msgstr "%s was not found in PATH; skipping dependency checks."
+msgstr "%s was not found in %s; skipping dependency checks."
 
-#, fuzzy
 msgid "Skipping source retrieval        -- using existing %s tree"
-msgstr "Skipping source retrieval        -- using existing src/ tree"
+msgstr "Skipping source retrieval        -- using existing %s tree"
 
-#, fuzzy
 msgid "Skipping source integrity checks -- using existing %s tree"
-msgstr "Skipping source integrity checks -- using existing src/ tree"
+msgstr "Skipping source integrity checks -- using existing %s tree"
 
-#, fuzzy
 msgid "Skipping source extraction       -- using existing %s tree"
-msgstr "Skipping source extraction       -- using existing src/ tree"
+msgstr "Skipping source extraction       -- using existing %s tree"
 
 msgid "The source directory is empty, there is nothing to build!"
 msgstr "The source directory is empty, there is nothing to build!"
@@ -659,9 +594,8 @@ msgstr "The package directory is empty, there is nothing to repackage!"
 msgid "Sources are ready."
 msgstr "Sources are ready."
 
-#, fuzzy
 msgid "Removing existing %s directory..."
-msgstr "Removing existing pkg/ directory..."
+msgstr "Removing existing %s directory..."
 
 msgid "Finished making: %s"
 msgstr "Finished making: %s"
@@ -697,146 +631,135 @@ msgid "Done."
 msgstr "Done."
 
 msgid "Manage pacman's list of trusted keys"
-msgstr ""
+msgstr "Manage pacman's list of trusted keys"
 
-#, fuzzy
 msgid "  -a, --add [<file(s)>]     Add the specified keys (empty for stdin)"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -a, --add [<file(s)>]     Add the specified keys (empty for stdin)"
 
-#, fuzzy
 msgid "  -d, --delete <keyid(s)>   Remove the specified keyids"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -d, --delete <keyid(s)>   Remove the specified keyids"
 
-#, fuzzy
 msgid "  -e, --export [<keyid(s)>] Export the specified or all keyids"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -e, --export [<keyid(s)>] Export the specified or all keyids"
 
 msgid ""
 "  -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids"
 msgstr ""
+"  -f, --finger [<keyid(s)>] List fingerprint for specified or all keyids"
 
-#, fuzzy
 msgid "  -h, --help                Show this help message and exit"
-msgstr "  -h, --help       This help"
+msgstr "  -h, --help                Show this help message and exit"
 
-#, fuzzy
 msgid "  -l, --list-keys [<keyid(s)>] List the specified or all keys"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -l, --list-keys [<keyid(s)>] List the specified or all keys"
 
-#, fuzzy
 msgid "  -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -r, --receive <keyserver> <keyid(s)> Fetch the specified keyids"
 
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
+msgstr "  -u, --updatedb            Update the trustdb of pacman"
 
-#, fuzzy
 msgid "  -v, --verify <signature>  Verify the file specified by the signature"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -v, --verify <signature>  Verify the file specified by the signature"
 
 msgid "  -V, --version             Show program version"
-msgstr ""
+msgstr "  -V, --version             Show program version"
 
 #, fuzzy
-msgid "  --config <file>           Use an alternate config file"
+msgid ""
+"  --config <file>           Use an alternate config file (instead of"
+"\\n                            '%s')"
 msgstr "  --config <file>  Use an alternate config file (instead of '%s')"
 
-msgid "                                    (instead of '%s')"
-msgstr ""
-
 msgid ""
 "  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
 msgstr ""
+"  --edit-key <keyid(s)>     Present a menu for key management task on keyids"
 
 #, fuzzy
-msgid "  --gpgdir <dir>            Set an alternate directory for gnupg"
-msgstr "  -p <file>        Use an alternate build script (instead of '%s')"
+msgid ""
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
+"\\n                            of '%s')"
+msgstr "  --gpgdir <dir>            Set an alternate directory for gnupg"
 
 msgid ""
 "  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
 msgstr ""
+"  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)"
 
 msgid ""
 "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
 "(s)"
 msgstr ""
+"  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir"
+"(s)"
 
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
+msgstr "  --init                    Ensure the keyring is properly initialised"
 
 msgid "  --list-sigs [<keyid(s)>]  List keys and their signatures"
-msgstr ""
+msgstr "  --list-sigs [<keyid(s)>]  List keys and their signatures"
 
 msgid "  --reload                  Reload the default keys"
-msgstr ""
+msgstr "  --reload                  Reload the default keys"
 
-#, fuzzy
 msgid "You do not have sufficient permissions to read the %s keyring..."
-msgstr "You do not have write permission to store packages in %s."
+msgstr "You do not have sufficient permissions to read the %s keyring..."
 
 msgid "Use '%s' to correct the keyring permissions."
-msgstr ""
+msgstr "Use '%s' to correct the keyring permissions."
 
-#, fuzzy
 msgid "You do not have sufficient permissions to run this command..."
-msgstr "You do not have write permission to store packages in %s."
+msgstr "You do not have sufficient permissions to run this command..."
 
-#, fuzzy
 msgid "Verifying official keys file signature..."
-msgstr "Rotating database into place..."
+msgstr "Verifying official keys file signature..."
 
-#, fuzzy
 msgid "The signature of file %s is not valid."
-msgstr "Creating updated database file '%s'"
+msgstr "The signature of file %s is not valid."
 
-#, fuzzy
 msgid "Verifying deprecated keys file signature..."
-msgstr "Rotating database into place..."
+msgstr "Verifying deprecated keys file signature..."
 
-#, fuzzy
 msgid "Verifying deleted keys file signature..."
-msgstr "Rotating database into place..."
+msgstr "Verifying deleted keys file signature..."
 
-#, fuzzy
 msgid "Appending official keys..."
-msgstr "Adding %s file..."
+msgstr "Appending official keys..."
 
 msgid "Appending deprecated keys..."
-msgstr ""
+msgstr "Appending deprecated keys..."
 
-#, fuzzy
 msgid "Removing deleted keys from keyring..."
-msgstr "Removing empty directories..."
+msgstr "Removing deleted keys from keyring..."
 
-#, fuzzy
 msgid "Updating trust database..."
-msgstr "Syncing database to disk..."
+msgstr "Updating trust database..."
 
 msgid "You need to specify the keyserver and at least one key identifier"
-msgstr ""
+msgstr "You need to specify the keyserver and at least one key identifier"
 
-#, fuzzy
 msgid "The key identified by %s does not exist"
-msgstr "%s file (%s) does not exist."
+msgstr "The key identified by %s does not exist"
 
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
+msgstr "Cannot find the %s binary required for all %s operations."
 
 msgid "%s needs to be run as root for this operation."
-msgstr ""
+msgstr "%s needs to be run as root for this operation."
 
 #, fuzzy
-msgid "%s configuation file '%s' not found."
-msgstr "Repository file '%s' was not found."
+msgid "%s configuration file '%s' not found."
+msgstr "%s configuation file '%s' not found."
 
 msgid "no operation specified (use -h for help)"
-msgstr ""
+msgstr "no operation specified (use -h for help)"
 
 msgid "Multiple operations specified"
-msgstr ""
+msgstr "Multiple operations specified"
 
 msgid "Please run %s with each operation separately\\n"
-msgstr ""
+msgstr "Please run %s with each operation separately\\n"
 
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
@@ -866,9 +789,8 @@ msgstr "diff tool was not found, please install diffutils."
 msgid "You must have correct permissions to optimize the database."
 msgstr "You must have correct permissions to optimise the database."
 
-#, fuzzy
 msgid "Can not create temp directory for database building."
-msgstr "Cannot create temp directory for database building."
+msgstr "Can not create temp directory for database building."
 
 msgid "MD5sum'ing the old database..."
 msgstr "MD5sum'ing the old database..."
@@ -949,9 +871,8 @@ msgstr "File '%s' does not exist"
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 msgstr "Cannot find the xdelta3 binary! Is xdelta3 installed?"
 
-#, fuzzy
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr "Usage: repo-add [-d] [-f] [-q] <path-to-db> <package|delta> ...\\n"
+msgstr "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 
 msgid ""
 "repo-add will update a package database by reading a package file."
@@ -960,21 +881,18 @@ msgstr ""
 "repo-add will update a package database by reading a package file."
 "\\nMultiple packages to add can be specified on the command line.\\n\\n"
 
-#, fuzzy
 msgid "Options:\\n"
-msgstr "Options:"
+msgstr "Options:\\n"
 
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
+msgstr "  -d, --delta       generate and add delta for package update\\n"
 
-#, fuzzy
 msgid "  -f, --files       update database's file list\\n"
-msgstr ""
-"Use the -f/--files flag to update a database including file entries.\\n\\n"
+msgstr "  -f, --files       update database's file list\\n"
 
-#, fuzzy
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
-msgstr "Usage: repo-remove [-q] <path-to-db> <packagename|delta> ...\\n\\n"
+msgstr ""
+"Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n\\n"
 
 msgid ""
 "repo-remove will update a package database by removing the package name"
@@ -986,38 +904,38 @@ msgstr ""
 "\\npackages to remove can be specified on the command line.\\n\\n"
 
 msgid "  -q, --quiet       minimize output\\n"
-msgstr ""
+msgstr "  -q, --quiet       minimise output\\n"
 
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
+msgstr "  -s, --sign        sign database with GnuPG after update\\n"
 
-#, fuzzy
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr "  -p, --file <package> query a package file instead of the database\n"
+msgstr "  -k, --key <key>   use the specified key to sign the database\\n"
 
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
+msgstr "  -v, --verify      verify database's signature before update\\n"
 
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
 "\\n"
 msgstr ""
+"\\nSee %s(8) for more details and descriptions of the available options.\\n"
+"\\n"
 
-#, fuzzy
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
-msgstr "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-1-i686.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"
 
-#, fuzzy
 msgid ""
 "Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@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) 2010-2011 Pacman Development Team <pacman-dev@archlinux.org>."
+"Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>\\n"
 "\\nThis is free software; see the source for copying conditions.\\nThere is "
 "NO WARRANTY, to the extent permitted by law.\\n"
 
@@ -1031,36 +949,32 @@ msgid "Removing existing entry '%s'..."
 msgstr "Removing existing entry '%s'..."
 
 #, fuzzy
-msgid "Cannot find the gpg binary! Is gnupg installed?"
-msgstr "Cannot find the xdelta3 binary! Is xdelta3 installed?"
+msgid "Cannot find the gpg binary! Is GnuPG installed?"
+msgstr "Cannot find the gpg binary! Is gnupg installed?"
 
-#, fuzzy
 msgid "Signing database..."
-msgstr "Syncing database to disk..."
+msgstr "Signing database..."
 
-#, fuzzy
 msgid "Failed to sign package database."
-msgstr "Failed to create package file."
+msgstr "Failed to sign package database."
 
-#, fuzzy
 msgid "Verifying database signature..."
-msgstr "Rotating database into place..."
+msgstr "Verifying database signature..."
 
 msgid "No existing signature found, skipping verification."
-msgstr ""
+msgstr "No existing signature found, skipping verification."
 
 msgid "Database signature file verified."
-msgstr ""
+msgstr "Database signature file verified."
 
 msgid "Database signature was NOT valid!"
-msgstr ""
+msgstr "Database signature was NOT valid!"
 
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' does not have a valid archive extension."
 
-#, fuzzy
 msgid "Computing checksums..."
-msgstr "Computing md5 checksums..."
+msgstr "Computing checksums..."
 
 msgid "An entry for '%s' already existed"
 msgstr "An entry for '%s' already existed"
@@ -1129,57 +1043,34 @@ msgid "No packages modified, nothing to do."
 msgstr "No packages modified, nothing to do."
 
 msgid "option %s requires an argument\\n"
-msgstr ""
+msgstr "option %s requires an argument\\n"
 
 msgid "unrecognized option"
-msgstr ""
-
-#~ msgid "Cannot find openssl."
-#~ msgstr "Cannot find openssl."
-
-#~ msgid "Removing libtool .la files..."
-#~ msgstr "Removing libtool .la files..."
-
-#~ msgid "  -C, --cleancache Clean up source files from the cache"
-#~ msgstr "  -C, --cleancache Clean up source files from the cache"
+msgstr "unrecognised option"
 
-#~ msgid "Cleaning up ALL files from %s."
-#~ msgstr "Cleaning up ALL files from %s."
+#~ msgid "Running %s as root is a BAD idea and can cause"
+#~ msgstr "Running %s as root is a BAD idea and can cause"
 
-#~ msgid "    Are you sure you wish to do this? "
-#~ msgstr "    Are you sure you wish to do this? "
+#~ msgid "permanent, catastrophic damage to your system. If you"
+#~ msgstr "permanent, catastrophic damage to your system. If you"
 
-#~ msgid "[y/N]"
-#~ msgstr "[y/N]"
+#~ msgid "wish to run as root, please use the %s option."
+#~ msgstr "wish to run as root, please use the %s option."
 
-#~ msgid "YES"
-#~ msgstr "YES"
+#~ msgid "Please rerun %s without the %s flag."
+#~ msgstr "Please rerun %s without the %s flag."
 
-#~ msgid "Y"
-#~ msgstr "Y"
+#~ msgid "Running %s as an unprivileged user will result in non-root"
+#~ msgstr "Running %s as an unprivileged user will result in non-root"
 
-#~ msgid "Problem removing files; you may not have correct permissions in %s"
-#~ msgstr "Problem removing files; you may not have correct permissions in %s"
+#~ msgid "ownership of the packaged files. Try using the %s environment by"
+#~ msgstr "ownership of the packaged files. Try using the %s environment by"
 
-#~ msgid "Source cache cleaned."
-#~ msgstr "Source cache cleaned."
+#~ msgid "placing %s in the %s array in %s."
+#~ msgstr "placing %s in the %s array in %s."
 
-#~ msgid "No files have been removed."
-#~ msgstr "No files have been removed."
-
-#~ msgid "Source destination must be defined in %s."
-#~ msgstr "Source destination must be defined in %s."
-
-#~ msgid "In addition, please run makepkg -C outside of your cache directory."
-#~ msgstr "In addition, please run makepkg -C outside of your cache directory."
-
-#, fuzzy
-#~ msgid "Usage: %s [options] <command> [arguments]"
-#~ msgstr "Usage: %s [options]"
-
-#, fuzzy
-#~ msgid "Executing: %s "
-#~ msgstr "Extracting %s with %s"
+#~ msgid "  --config <file>           Use an alternate config file"
+#~ msgstr "  --config <file>           Use an alternate config file"
 
-#~ msgid "ERROR: Can not create temp directory for database building."
-#~ msgstr "ERROR: Can not create temp directory for database building."
+#~ msgid "                                    (instead of '%s')"
+#~ msgstr "                                    (instead of '%s')"