Merge branch 'maint'

Conflicts:
	scripts/pacman-key.sh.in

8 files changed, 208 insertions, 221 deletions

diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in
index 162530ef..f80c816d 100644
--- a/contrib/pacsysclean.sh.in
+++ b/contrib/pacsysclean.sh.in
@@ -36,7 +36,7 @@ IFS=$'\n'
 name="^Name.*: (.*)$"
 size="^Installed Size.*: (.*) KiB$"
 
-[[ $PACMAN_OPTS != -* ]] && PACMAN_OPTS="-$PACMAN_OPTS"
+[[ $PACMAN_OPTS && $PACMAN_OPTS != -* ]] && PACMAN_OPTS="-$PACMAN_OPTS"
 
 for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do
        if [[ $line =~ $name ]]; then
diff --git a/doc/index.txt b/doc/index.txt
index d0ac8bac..5d93bb71 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -218,7 +218,7 @@ Other Utilities
 ~~~~~~~~~~~~~~~
 Although the package manager itself is quite simple, many scripts have been
 developed that help automate building and installing packages. These are used
-extensively in link:http://archlinux.org/[Arch Linux]. Most of these utilities
+extensively in link:http://www.archlinux.org/[Arch Linux]. Most of these utilities
 are available in the Arch Linux projects
 link:http://projects.archlinux.org/[code browser].
 
@@ -238,31 +238,9 @@ such as your commandline, the nature of the bug, and even the package database
 if it helps.
 
 You can also post a bug to the Arch Linux bug tracker
-link:http://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
+link:https://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
 bugs under the Pacman project.
 
-Pacman/libalpm in the Wild
---------------------------
-Although Arch Linux is the primary user of pacman and libalpm, other
-distributions and projects also use pacman as a package management tool. In
-addition, there have been several projects started to provide a frontend GUI to
-pacman and/or libalpm.
-
-Arch derivatives:
-
-* link:http://archie.dotsrc.org/[Archie] - Arch Live on steroids
-* link:http://www.faunos.com/[FaunOS] - A portable, fully integrated operating system based on Arch Linux
-* link:http://larch.berlios.de/[larch] - A live CD/DVD/USB-stick construction kit for Arch Linux
-
-Other distributions:
-
-* link:http://www.delilinux.org/[DeLi Linux] - "Desktop Light" Linux, a Linux distribution for old computers
-* link:http://www.frugalware.org/[Frugalware Linux] - A general purpose Linux distribution for intermediate users (pacman is forked and maintained separately)
-
-Pacman/libalpm frontends:
-
-* link:http://shaman.iskrembilen.com/[Shaman] - A GUI frontend using Qt and libalpm
-
 Copyright
 ---------
 pacman is Copyright (C) 2006-2012 Pacman Development Team
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 3b858037..0ad81882 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -232,13 +232,6 @@ Upgrade Options (apply to '-S' and '-U')[[UO]]
 *\--needed*::
 	Do not reinstall the targets that are already up to date.
 
-*\--recursive*::
-	Recursively reinstall all dependencies of the targets. This forces upgrades
-	or reinstalls of all dependencies without requiring explicit version
-	requirements. This is most useful in combination with the '\--needed' flag,
-	which will induce a deep dependency upgrade without any unnecessary
-	reinstalls.
-
 
 Query Options[[QO]]
 -------------------
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index b0077665..edddc318 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -489,8 +489,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
 	if(alpm_pkg_has_scriptlet(newpkg) &&
 			!(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
 		const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
-		_alpm_runscriptlet(handle, pkgfile,
-				scriptlet_name, newpkg->version, NULL, 1);
+
+		_alpm_runscriptlet(handle, pkgfile, scriptlet_name,
+				newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
 	}
 
 	/* we override any pre-set reason if we have alldeps or allexplicit set */
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index fb790f6e..ae491d26 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -143,11 +143,11 @@ key_lookup_from_name() {
 generate_master_key() {
 	# Generate the master key, which will be in both pubring and secring
 	"${GPG_PACMAN[@]}" --gen-key --batch <<EOF
-%echo Generating pacman keychain master key...
+%echo Generating pacman keyring master key...
 Key-Type: RSA
 Key-Length: 2048
 Key-Usage: sign
-Name-Real: Pacman Keychain Master Key
+Name-Real: Pacman Keyring Master Key
 Name-Email: pacman@localhost
 Expire-Date: 0
 %commit
@@ -287,7 +287,7 @@ populate_keyring() {
 	#  40CHARFINGERPRINTXXXXXXXXXXXXXXXXXXXXXXX:5:
 	local -A trusted_ids
 	for keyring in "${KEYRINGIDS[@]}"; do
-		if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
+		if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
 			while IFS=: read key_id _; do
 				# skip blank lines, comments; these are valid in this file
 				[[ -z $key_id || ${key_id:0:1} = \# ]] && continue
@@ -306,7 +306,7 @@ populate_keyring() {
 		done
 		msg "$(gettext "Importing owner trust values...")"
 		for keyring in "${KEYRINGIDS[@]}"; do
-			if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
+			if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
 				"${GPG_PACMAN[@]}" --import-ownertrust "${KEYRING_IMPORT_DIR}/${keyring}-trusted"
 			fi
 		done
@@ -317,7 +317,7 @@ populate_keyring() {
 	# guarantee of identification for the keys.
 	local -A revoked_ids
 	for keyring in "${KEYRINGIDS[@]}"; do
-		if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
+		if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
 			mapfile -t keys < "${KEYRING_IMPORT_DIR}/${keyring}-revoked"
 			while IFS=: read _ _ _ _ key_id _; do
 				if [[ -n $key_id ]]; then
@@ -339,7 +339,7 @@ populate_keyring() {
 
 add_keys() {
 	if ! "${GPG_PACMAN[@]}" --quiet --batch --import "$@" ; then
-		error "$(gettext "A specified keyfile could not be added to the gpg keychain.")"
+		error "$(gettext "A specified keyfile could not be added to the keyring.")"
 		exit 1
 	fi
 }
@@ -347,7 +347,7 @@ add_keys() {
 delete_keys() {
 	check_keyids_exist "$@"
 	if ! "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "$@" ; then
-		error "$(gettext "A specified key could not be removed from the gpg keychain.")"
+		error "$(gettext "A specified key could not be removed from the keyring.")"
 		exit 1
 	fi
 }
@@ -369,7 +369,7 @@ edit_keys() {
 export_keys() {
 	check_keyids_exist "$@"
 	if ! "${GPG_PACMAN[@]}" --armor --export "$@" ; then
-		error "$(gettext "A specified key could not be exported from the gpg keychain.")"
+		error "$(gettext "A specified key could not be exported from the keyring.")"
 		exit 1
 	fi
 }
diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
index bc79a1c0..0aa6169a 100644
--- a/scripts/pkgdelta.sh.in
+++ b/scripts/pkgdelta.sh.in
@@ -53,9 +53,9 @@ This delta file can then be added to a database using repo-add.\n\n")"
 	printf -- "$(gettext "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz")\n"
 	echo
 	printf -- "$(gettext "Options:\n")"
-	printf -- "  -q                ""$(gettext "quiet\n")"
-	printf -- "  --min-pkg-size    ""$(gettext "minimal of package before deltas are generated (bytes)\n")"
-	printf -- "  --max-delta-size  ""$(gettext "percent of new package above which the delta will be discarded\n")"
+	printf -- "$(gettext "  -q, --quiet       minimize output\n")"
+	printf -- "$(gettext "  --min-pkg-size    minimum package size before deltas are generated (bytes)\n")"
+	printf -- "$(gettext "  --max-delta-size  percent of package size above which deltas will be discarded\n")"
 }
 
 version() {
diff --git a/scripts/po/en_GB.po b/scripts/po/en_GB.po
index 94408f9c..afe8cc75 100644
--- a/scripts/po/en_GB.po
+++ b/scripts/po/en_GB.po
@@ -8,8 +8,8 @@ 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: 2012-03-28 18:00-0500\n"
-"PO-Revision-Date: 2012-02-02 06:08+0000\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\n"
+"PO-Revision-Date: 2012-05-20 11:27-0600\n"
 "Last-Translator: Dan McGee <dpmcgee@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: en_GB\n"
@@ -76,8 +76,7 @@ msgid "Generating checksums for source files..."
 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."
+msgstr "Cannot find the %s binary required for generating sourcefile checksums."
 
 msgid "Invalid integrity algorithm '%s' specified."
 msgstr "Invalid integrity algorithm '%s' specified."
@@ -265,6 +264,9 @@ 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."
 
+msgid "%s contains invalid characters: '%s'"
+msgstr "%s contains invalid characters: '%s'"
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr "%s is not allowed to contain colons, hyphens or whitespace."
 
@@ -317,8 +319,7 @@ msgid "Cannot find the %s binary required for verifying source files."
 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."
+msgstr "Cannot find the %s binary required for validating sourcefile checksums."
 
 msgid "Cannot find the %s binary required for compressing binaries."
 msgstr "Cannot find the %s binary required for compressing binaries."
@@ -386,29 +387,20 @@ msgstr "  -o, --nobuild    Download and extract files only"
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
 msgstr "  -p <file>        Use an alternate build script (instead of '%s')"
 
-msgid ""
-"  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgid "  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgstr "  -r, --rmdeps     Remove installed dependencies after a successful build"
 
 msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Repackage contents of the package without rebuilding"
 
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
 msgstr "  -s, --syncdeps   Install missing dependencies with %s"
 
-msgid ""
-"  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Generate a source-only tarball without downloaded sources"
+msgid "  -S, --source     Generate a source-only tarball without downloaded sources"
+msgstr "  -S, --source     Generate a source-only tarball without downloaded sources"
 
-msgid ""
-"  --allsource      Generate a source-only tarball including downloaded "
-"sources"
-msgstr ""
-"  --allsource      Generate a source-only tarball including downloaded "
-"sources"
+msgid "  --allsource      Generate a source-only tarball including downloaded sources"
+msgstr "  --allsource      Generate a source-only tarball including downloaded sources"
 
 msgid "  --asroot         Allow %s to run as root user"
 msgstr "  --asroot         Allow %s to run as root user"
@@ -419,15 +411,11 @@ 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')"
 
-msgid ""
-"  --holdver        Prevent automatic version bumping for development %ss"
-msgstr ""
-"  --holdver        Prevent automatic version bumping for development %ss"
+msgid "  --holdver        Prevent automatic version bumping for development %ss"
+msgstr "  --holdver        Prevent automatic version bumping for development %ss"
 
-msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+msgid "  --key <key>      Specify a key to use for %s signing instead of the default"
+msgstr "  --key <key>      Specify a key to use for %s signing instead of the default"
 
 msgid "  --nocheck        Do not run the %s function in the %s"
 msgstr "  --nocheck        Do not run the %s function in the %s"
@@ -444,10 +432,8 @@ msgstr "  --sign           Sign the resulting package with %s"
 msgid "  --skipchecksums  Do not verify checksums of the source files"
 msgstr "  --skipchecksums  Do not verify checksums of the source files"
 
-msgid ""
-"  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Do not perform any verification checks on source files"
+msgid "  --skipinteg      Do not perform any verification checks on source files"
+msgstr "  --skipinteg      Do not perform any verification checks on source files"
 
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgstr "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -455,10 +441,8 @@ msgstr "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgid "These options can be passed to %s:"
 msgstr "These options can be passed to %s:"
 
-msgid ""
-"  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Do not ask for confirmation when resolving dependencies"
+msgid "  --noconfirm      Do not ask for confirmation when resolving dependencies"
+msgstr "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
 msgstr "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -467,15 +451,17 @@ msgid "If %s is not specified, %s will look for '%s'"
 msgstr "If %s is not specified, %s will look for '%s'"
 
 msgid ""
-"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 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"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>.\\n"
+"Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 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"
+"Copyright (c) 2006-2012 Pacman Development Team <pacman-dev@archlinux.org>.\\n"
+"Copyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 
 msgid "%s signal caught. Exiting..."
 msgstr "%s signal caught. Exiting..."
@@ -505,29 +491,29 @@ msgid "\\0%s and %s cannot both be specified"
 msgstr "\\0%s and %s cannot both be specified"
 
 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."
+"Running %s as root is a BAD idea and can cause permanent,\\n"
+"catastrophic damage to your system. If you wish to run as root, please\\n"
+"use the %s option."
 msgstr ""
-"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."
+"Running %s as root is a BAD idea and can cause permanent,\\n"
+"catastrophic damage to your system. If you wish to run as root, please\\n"
+"use the %s option."
 
 msgid ""
-"The %s option is meant for the root user only. Please\\nrerun %s without the "
-"%s flag."
+"The %s option is meant for the root user only. Please\\n"
+"rerun %s without the %s flag."
 msgstr ""
-"The %s option is meant for the root user only. Please\\nrerun %s without the "
-"%s flag."
+"The %s option is meant for the root user only. Please\\n"
+"rerun %s without the %s flag."
 
 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."
+"Running %s as an unprivileged user will result in non-root\\n"
+"ownership of the packaged files. Try using the %s environment by\\n"
+"placing %s in the %s array in %s."
 msgstr ""
-"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."
+"Running %s as an unprivileged user will result in non-root\\n"
+"ownership of the packaged files. Try using the %s environment by\\n"
+"placing %s in the %s array in %s."
 
 msgid "Do not use the %s option. This option is only for use by %s."
 msgstr "Do not use the %s option. This option is only for use by %s."
@@ -550,17 +536,14 @@ msgstr "A package has already been built, installing existing package..."
 msgid "A package has already been built. (use %s 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..."
+msgid "The package group has already been built, installing existing packages..."
+msgstr "The package group has already been built, installing existing packages..."
 
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "The package group has already been built. (use %s to overwrite)"
 
 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 %s to overwrite)"
+msgstr "Part of the package group has already been built. (use %s to overwrite)"
 
 msgid "Leaving %s environment."
 msgstr "Leaving %s environment."
@@ -623,13 +606,13 @@ msgid "Usage: %s [pacman_db_root]"
 msgstr "Usage: %s [pacman_db_root]"
 
 msgid ""
-"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>.\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2012 Pacman Development Team <pacman-dev@archlinux.org>.\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 
 msgid "%s does not exist or is not a directory."
 msgstr "%s does not exist or is not a directory."
@@ -661,10 +644,8 @@ msgstr "  -d, --delete <keyid(s)>   Remove the specified keyids"
 msgid "  -e, --export [keyid(s)]   Export the specified or all keyids"
 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"
+msgid "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
+msgstr "  -f, --finger [keyid(s)]   List fingerprint for specified or all keyids"
 
 msgid "  -h, --help                Show this help message and exit"
 msgstr "  -h, --help                Show this help message and exit"
@@ -685,33 +666,27 @@ msgid "  -V, --version             Show program version"
 msgstr "  -V, --version             Show program version"
 
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 
-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"
+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"
 
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 
 msgid "  --import <dir(s)>         Imports pubring.gpg from dir(s)"
 msgstr "  --import <dir(s)>         Imports pubring.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 "  --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 "  --init                    Ensure the keyring is properly initialised"
@@ -726,16 +701,14 @@ msgid "  --lsign-key <keyid>       Locally sign the specified keyid"
 msgstr "  --lsign-key <keyid>       Locally sign the specified keyid"
 
 msgid ""
-"  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate [keyring(s)]   Reload the default keys from the (given) keyrings\\n"
+"                            in '%s'"
 msgstr ""
-"  --populate [keyring(s)]   Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate [keyring(s)]   Reload the default keys from the (given) keyrings\\n"
+"                            in '%s'"
 
-msgid ""
-"  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
+msgid "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
+msgstr "  --refresh-keys [keyid(s)] Update specified or all keys from a keyserver"
 
 msgid "The key identified by %s could not be found locally."
 msgstr "The key identified by %s could not be found locally."
@@ -779,17 +752,17 @@ msgstr "Disabling revoked keys in keyring..."
 msgid "Disabling key %s..."
 msgstr "Disabling key %s..."
 
-msgid "A specified keyfile could not be added to the gpg keychain."
-msgstr "A specified keyfile could not be added to the gpg keychain."
+msgid "A specified keyfile could not be added to the keyring."
+msgstr "A specified keyfile could not be added to the keyring."
 
-msgid "A specified key could not be removed from the gpg keychain."
-msgstr "A specified key could not be removed from the gpg keychain."
+msgid "A specified key could not be removed from the keyring."
+msgstr "A specified key could not be removed from the keyring."
 
 msgid "The key identified by %s could not be edited."
 msgstr "The key identified by %s could not be edited."
 
-msgid "A specified key could not be exported from the gpg keychain."
-msgstr "A specified key could not be exported from the gpg keychain."
+msgid "A specified key could not be exported from the keyring."
+msgstr "A specified key could not be exported from the keyring."
 
 msgid "The fingerprint of a specified key could not be determined."
 msgstr "The fingerprint of a specified key could not be determined."
@@ -843,26 +816,28 @@ msgid "Please run %s with each operation separately."
 msgstr "Please run %s with each operation separately."
 
 msgid ""
-"pacman-optimize is a little hack that should improve the performance\\nof "
-"pacman when reading/writing to its filesystem-based database.\\n\\n"
+"pacman-optimize is a little hack that should improve the performance\\n"
+"of pacman when reading/writing to its filesystem-based database.\\n"
+"\\n"
 msgstr ""
-"pacman-optimize is a little hack that should improve the performance\\nof "
-"pacman when reading/writing to its filesystem-based database.\\n\\n"
+"pacman-optimize is a little hack that should improve the performance\\n"
+"of pacman when reading/writing to its filesystem-based database.\\n"
+"\\n"
 
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
-"attempts to relocate these small files into one\\ncontinuous location on "
-"your hard drive. The result is that the hard\\ndrive should be able to read "
-"them faster, since the hard drive head\\ndoes not have to move around the "
-"disk as much.\\n"
+"Because pacman uses many small files to keep track of packages,\\n"
+"there is a tendency for these files to become fragmented over time.\\n"
+"This script attempts to relocate these small files into one\\n"
+"continuous location on your hard drive. The result is that the hard\\n"
+"drive should be able to read them faster, since the hard drive head\\n"
+"does not have to move around the disk as much.\\n"
 msgstr ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
-"attempts to relocate these small files into one\\ncontinuous location on "
-"your hard drive. The result is that the hard\\ndrive should be able to read "
-"them faster, since the hard drive head\\ndoes not have to move around the "
-"disk as much.\\n"
+"Because pacman uses many small files to keep track of packages,\\n"
+"there is a tendency for these files to become fragmented over time.\\n"
+"This script attempts to relocate these small files into one\\n"
+"continuous location on your hard drive. The result is that the hard\\n"
+"drive should be able to read them faster, since the hard drive head\\n"
+"does not have to move around the disk as much.\\n"
 
 msgid "diff tool was not found, please install diffutils."
 msgstr "diff tool was not found, please install diffutils."
@@ -903,31 +878,50 @@ msgstr "Rotating database into place..."
 msgid "Finished. Your pacman database has been optimized."
 msgstr "Finished. Your pacman database has been optimised."
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
-msgstr "Usage: pkgdelta [-q] <package1> <package2>\\n"
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
+msgstr "Usage: pkgdelta [options] <package1> <package2>\\n"
 
 msgid ""
-"\tpkgdelta will create a delta file between two packages.\\nThis delta file "
-"can then be added to a database using repo-add.\\n\\n"
+"\tpkgdelta will create a delta file between two packages.\\n"
+"This delta file can then be added to a database using repo-add.\\n"
+"\\n"
 msgstr ""
-"\tpkgdelta will create a delta file between two packages.\\nThis delta file "
-"can then be added to a database using repo-add.\\n\\n"
+"\tpkgdelta will create a delta file between two packages.\\n"
+"This delta file can then be added to a database using repo-add.\\n"
+"\\n"
 
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 
+msgid "Options:\\n"
+msgstr "Options:\\n"
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr "  -q, --quiet       minimise output\\n"
+
+msgid "  --min-pkg-size    minimum package size before deltas are generated (bytes)\\n"
+msgstr "  --min-pkg-size    minimum package size before deltas are generated (bytes)\\n"
+
+msgid "  --max-delta-size  percent of package size above which deltas will be discarded\\n"
+msgstr "  --max-delta-size  percent of package size above which deltas will be discarded\\n"
+
 msgid ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 
 msgid "Invalid package file '%s'."
 msgstr "Invalid package file '%s'."
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr "Skipping delta creation for small package: %s - size %s"
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr "The package names don't match : '%s' and '%s'"
 
@@ -943,6 +937,9 @@ msgstr "Generating delta from version %s to version %s"
 msgid "Delta could not be created."
 msgstr "Delta could not be created."
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr "Delta package larger than maximum size. Removing."
+
 msgid "Generated delta : '%s'"
 msgstr "Generated delta : '%s'"
 
@@ -956,14 +953,11 @@ msgid "Usage: repo-add [options] <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."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package file.\\n"
+"Multiple packages to add can be specified on the command line.\\n"
 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"
-
-msgid "Options:\\n"
-msgstr "Options:\\n"
+"repo-add will update a package database by reading a package file.\\n"
+"Multiple packages to add can be specified on the command line.\\n"
 
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr "  -d, --delta       generate and add delta for package update\\n"
@@ -975,20 +969,17 @@ msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 msgstr "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\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"
+"repo-remove will update a package database by removing the package name\\n"
+"specified on the command line from the given repo database. Multiple\\n"
+"packages to remove can be specified on the command line.\\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"
+"repo-remove will update a package database by removing the package name\\n"
+"specified on the command line from the given repo database. Multiple\\n"
+"packages to remove can be specified on the command line.\\n"
 
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr "Please move along, there is nothing to see here.\\n"
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr "  -q, --quiet       minimise output\\n"
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr "  -s, --sign        sign database with GnuPG after update\\n"
 
@@ -999,26 +990,28 @@ msgid "  -v, --verify      verify database's signature before update\\n"
 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"
+"See %s(8) for more details and descriptions of the available options.\\n"
 msgstr ""
-"\\nSee %s(8) for more details and descriptions of the available options.\\n"
+"\\n"
+"See %s(8) for more details and descriptions of the available options.\\n"
 
-msgid ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgid "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 msgstr "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 msgid ""
 "Copyright (c) 2006-2012 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"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 "Copyright (c) 2006-2012 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"
+"\\n"
+"This is free software; see the source for copying conditions.\\n"
+"There is NO WARRANTY, to the extent permitted by law.\\n"
 
 msgid "No database entry for package '%s'."
 msgstr "No database entry for package '%s'."
@@ -1133,3 +1126,6 @@ msgstr "option %s requires an argument\\n"
 
 msgid "unrecognized option"
 msgstr "unrecognised option"
+
+#~ msgid "quiet\\n"
+#~ msgstr "quiet\\n"
diff --git a/scripts/po/pacman-scripts.pot b/scripts/po/pacman-scripts.pot
index 72772047..2abdbeea 100644
--- a/scripts/po/pacman-scripts.pot
+++ b/scripts/po/pacman-scripts.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pacman 4.0.2\n"
+"Project-Id-Version: pacman 4.0.3\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2012-03-28 18:00-0500\n"
+"POT-Creation-Date: 2012-05-20 11:26-0500\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"
@@ -263,6 +263,9 @@ msgstr ""
 msgid "%s is not allowed to start with a hyphen."
 msgstr ""
 
+msgid "%s contains invalid characters: '%s'"
+msgstr ""
+
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
 msgstr ""
 
@@ -739,16 +742,16 @@ msgstr ""
 msgid "Disabling key %s..."
 msgstr ""
 
-msgid "A specified keyfile could not be added to the gpg keychain."
+msgid "A specified keyfile could not be added to the keyring."
 msgstr ""
 
-msgid "A specified key could not be removed from the gpg keychain."
+msgid "A specified key could not be removed from the keyring."
 msgstr ""
 
 msgid "The key identified by %s could not be edited."
 msgstr ""
 
-msgid "A specified key could not be exported from the gpg keychain."
+msgid "A specified key could not be exported from the keyring."
 msgstr ""
 
 msgid "The fingerprint of a specified key could not be determined."
@@ -855,7 +858,7 @@ msgstr ""
 msgid "Finished. Your pacman database has been optimized."
 msgstr ""
 
-msgid "Usage: pkgdelta [-q] <package1> <package2>\\n"
+msgid "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgstr ""
 
 msgid ""
@@ -866,6 +869,22 @@ msgstr ""
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
 msgstr ""
 
+msgid "Options:\\n"
+msgstr ""
+
+msgid "  -q, --quiet       minimize output\\n"
+msgstr ""
+
+msgid ""
+"  --min-pkg-size    minimum package size before deltas are generated "
+"(bytes)\\n"
+msgstr ""
+
+msgid ""
+"  --max-delta-size  percent of package size above which deltas will be "
+"discarded\\n"
+msgstr ""
+
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
@@ -875,6 +894,9 @@ msgstr ""
 msgid "Invalid package file '%s'."
 msgstr ""
 
+msgid "Skipping delta creation for small package: %s - size %s"
+msgstr ""
+
 msgid "The package names don't match : '%s' and '%s'"
 msgstr ""
 
@@ -890,6 +912,9 @@ msgstr ""
 msgid "Delta could not be created."
 msgstr ""
 
+msgid "Delta package larger than maximum size. Removing."
+msgstr ""
+
 msgid "Generated delta : '%s'"
 msgstr ""
 
@@ -907,9 +932,6 @@ msgid ""
 "\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
-msgid "Options:\\n"
-msgstr ""
-
 msgid "  -d, --delta       generate and add delta for package update\\n"
 msgstr ""
 
@@ -928,9 +950,6 @@ msgstr ""
 msgid "Please move along, there is nothing to see here.\\n"
 msgstr ""
 
-msgid "  -q, --quiet       minimize output\\n"
-msgstr ""
-
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
 msgstr ""