Update several translation strings

* Fix typos/capitalization
* Make sure large blocks of text are translated in one unit

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

3 files changed, 16 insertions, 16 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 72f4d493..8845a417 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -729,7 +729,7 @@ check_pgpsigs() {
 
 		if ! gpg --quiet --batch --status-file "$statusfile" --verify "$file" "$sourcefile" 2> /dev/null; then
 			if grep "NO_PUBKEY" "$statusfile" > /dev/null; then
-				echo "$(gettext "Warning: Unknown public key") $(awk '/NO_PUBKEY/ {print $3}' $statusfile)" >&2
+				warning "$(gettext "Unknown public key") $(awk '/NO_PUBKEY/ {print $3}' $statusfile)" >&2
 				warnings=1
 			else
 				echo "$(gettext "FAILED")" >&2
@@ -1856,7 +1856,7 @@ usage() {
 	printf "$(gettext "  --sign           Sign the resulting package with %s")\n" "gpg"
 	echo "$(gettext "  --skipchecksums  Do not verify checksums of the source files")"
 	echo "$(gettext "  --skipinteg      Do not perform any verification checks on source files")"
-	echo "$(gettext "  --skippgpcheck   Do not verify source files with pgp signatures")"
+	echo "$(gettext "  --skippgpcheck   Do not verify source files with PGP signatures")"
 	echo "$(gettext "  --source         Generate a source-only tarball without downloaded sources")"
 	echo
 	printf "$(gettext "These options can be passed to %s:")\n" "pacman"
@@ -2052,19 +2052,19 @@ fi
 if (( ! INFAKEROOT )); then
 	if (( EUID == 0 && ! ASROOT )); then
 		# Warn those who like to live dangerously.
-		error "$(gettext "Running %s as root is a BAD idea and can cause")" "makepkg"
-		plain "$(gettext "permanent, catastrophic damage to your system. If you")"
-		plain "$(gettext "wish to run as root, please use the %s option.")" "--asroot"
+		error "$(gettext "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.")" "makepkg" "--asroot"
 		exit 1 # $E_USER_ABORT
 	elif (( EUID > 0 && ASROOT )); then
 		# Warn those who try to use the --asroot option when they are not root
-		error "$(gettext "The %s option is meant for the root user only.")" "--asroot"
-		plain "$(gettext "Please rerun %s without the %s flag.")" "makepkg" "--asroot"
+		error "$(gettext "The %s option is meant for the root user only. Please\n\
+rerun %s without the %s flag.")" "--asroot" "makepkg" "--asroot"
 		exit 1 # $E_USER_ABORT
 	elif (( EUID > 0 )) && [[ $(check_buildenv fakeroot) != "y" ]]; then
-		warning "$(gettext "Running %s as an unprivileged user will result in non-root")" "makepkg"
-		plain "$(gettext "ownership of the packaged files. Try using the %s environment by")" "fakeroot"
-		plain "$(gettext "placing %s in the %s array in %s.")" "'fakeroot'" "BUILDENV" "$MAKEPKG_CONF"
+		warning "$(gettext "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.")" "makepkg" "fakeroot" "'fakeroot'" "BUILDENV" "$MAKEPKG_CONF"
 		sleep 1
 	fi
 else
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 1fc1ab5b..74ecfcf1 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -64,11 +64,11 @@ usage() {
 	echo "$(gettext "  -u, --updatedb            Update the trustdb of pacman")"
 	echo "$(gettext "  -v, --verify <signature>  Verify the file specified by the signature")"
 	echo "$(gettext "  -V, --version             Show program version")"
-	echo "$(gettext "  --config <file>           Use an alternate config file")"
-	printf "$(gettext "                                    (instead of '%s')")\n" "@sysconfdir@/pacman.conf"
+	printf "$(gettext "  --config <file>           Use an alternate config file (instead of\n\
+                            '%s')")\n" "@sysconfdir@/pacman.conf"
 	echo "$(gettext "  --edit-key <keyid(s)>     Present a menu for key management task on keyids")"
-	echo "$(gettext "  --gpgdir <dir>            Set an alternate directory for gnupg")"
-	printf "$(gettext "                                    (instead of '%s')")\n" "@sysconfdir@/pacman.d/gnupg"
+	printf "$(gettext "  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\n\
+                            of '%s')")\n" "@sysconfdir@/pacman.d/gnupg"
 	echo "$(gettext "  --import <dir(s)>         Imports pubring.gpg and trustdb.gpg from dir(s)")"
 	echo "$(gettext "  --import-trustdb <dir(s)> Imports ownertrust values from trustdb.gpg in dir(s)")"
 	echo "$(gettext "  --init                    Ensure the keyring is properly initialized")"
@@ -375,7 +375,7 @@ fi
 
 CONFIG=${CONFIG:-@sysconfdir@/pacman.conf}
 if [[ ! -r "${CONFIG}" ]]; then
-	error "$(gettext "%s configuation file '%s' not found.")" "pacman" "$CONFIG"
+	error "$(gettext "%s configuration file '%s' not found.")" "pacman" "$CONFIG"
 	exit 1
 fi
 
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 48f221b8..5e085922 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -176,7 +176,7 @@ db_remove_delta() {
 
 check_gpg() {
 	if ! type -p gpg >/dev/null; then
-		error "$(gettext "Cannot find the gpg binary! Is gnupg installed?")"
+		error "$(gettext "Cannot find the gpg binary! Is GnuPG installed?")"
 		exit 1 # $E_MISSING_PROGRAM
 	fi
 }